ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/TCPControlHandler.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/TCPControlHandler.java (file contents):
Revision 1.20 by tdb, Wed Mar 14 23:25:29 2001 UTC vs.
Revision 1.21 by tdb, Sat Mar 17 03:57:38 2001 UTC

# Line 97 | Line 97 | class TCPControlHandler extends Thread {
97                  // make a decision about what to do
98                  if(cmd.equals("STARTCONFIG")) {
99                      // get the configuration for this client
100 <                    Configuration myConfig = _configManager.getConfiguration("Client."+_clientName);
100 >                    ConfigurationProxy cp = ConfigurationProxy.getInstance();
101                      sendOK();
102                      // get properties
103                      cmd = _socketIn.readLine();
# Line 109 | Line 109 | class TCPControlHandler extends Thread {
109                          // client is restricted to this properties
110                          if(cmd.startsWith("Client.") || cmd.startsWith("Host.")) {
111                              try {
112 <                                String returnedProperty = myConfig.getProperty(cmd);    
112 >                                String returnedProperty = cp.getProperty("Client."+_clientName, cmd);    
113                                  send(returnedProperty);
114                              }
115 <                            catch (org.omg.CORBA.MARSHAL e) {
115 >                            catch (PropertyNotFoundException e) {
116                                  sendERROR();
117                              }
118                          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines