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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java (file contents):
Revision 1.12 by tdb, Thu Mar 1 20:22:21 2001 UTC vs.
Revision 1.13 by tdb, Thu Mar 1 21:06:58 2001 UTC

# Line 123 | Line 123 | class ConfigurationManagerServant extends Configuratio
123              }
124          }
125          // add the system config as the final check
126 <        fileList += _systemConfigFile + ";";
126 >        fileList = _systemConfigFile + ";" + fileList;
127          _logger.write(toString(), Logger.DEBUG, "config tree - " + fileList);
128          
129          // build the configuration
# Line 315 | Line 315 | class ConfigurationManagerServant extends Configuratio
315                  
316                  // some holders for variables
317                  File currentFile;
318 <                long lastModified, newLastModified;
318 >                long lastModified, newLastModified = 0;
319                  Properties properties, prevProperties;
320                  
321                  // the root of all configurations will be the system config
322                  // so we need to open the properties of that
323                  Properties defaultProperties = new Properties();
324 –                currentFile = new File(_configPath, _systemConfigFile);
325 –                lastModified = currentFile.lastModified();
326 –                defaultProperties.load(new FileInputStream(currentFile));
324                  
325                  // This loop then iterates over the file list
326                  // creates the properties to be passed to the
327                  // Configuration constructor
328 <                do {
328 >                while (st.hasMoreTokens()) {
329                      properties = new Properties(defaultProperties);
330                      currentFile = new File(_configPath, st.nextToken());
331                      newLastModified = currentFile.lastModified();
# Line 337 | Line 334 | class ConfigurationManagerServant extends Configuratio
334                      }
335                      properties.load(new FileInputStream(currentFile));
336                      defaultProperties = properties;
337 <                } while (st.hasMoreTokens());
337 >                }
338  
339                  // this creates the configuration, all nice, ready to be returned
340                  ConfigurationServant ref = new ConfigurationServant(properties, fileList, lastModified);
341                  org.omg.CORBA.Object objRef = _refman.getRootPOA().servant_to_reference(ref);
342                  config = ConfigurationHelper.narrow(objRef);
343 <
343 >                _logger.write(toString(), Logger.DEBUG, "returning built configuration");
344              } catch (Exception e) {
345                  // not sure what to do here
346                  // so we just log the error

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines