Lin, I wonder if we should instead log a warning when the file was specified but not found. With this change and in most cases where LocalAttributeManager is used, the user will have no idea that the file was not read (and later might result in weird exceptions as the variables in config.xml did not get resolved). Or maybe we need to do something special for the "assemble the server" case since these FilleNotFound errors are only visible there.
Jarek On Thu, Jun 19, 2008 at 11:27 AM, <[EMAIL PROTECTED]> wrote: > Author: linsun > Date: Thu Jun 19 08:27:35 2008 > New Revision: 669506 > > URL: http://svn.apache.org/viewvc?rev=669506&view=rev > Log: > GERONIMO-3971 - Error message during assembling a server > > Modified: > > geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java > > Modified: > geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=669506&r1=669505&r2=669506&view=diff > ============================================================================== > --- > geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java > (original) > +++ > geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java > Thu Jun 19 08:27:35 2008 > @@ -615,7 +615,7 @@ > > private static Properties loadConfigSubstitutions(File > configSubstitutionsFile) { > Properties properties = new Properties(); > - if (configSubstitutionsFile != null) { > + if (configSubstitutionsFile != null && > configSubstitutionsFile.exists()) { > try { > FileInputStream in = new > FileInputStream(configSubstitutionsFile); > try { > > >
