You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by li...@apache.org on 2008/06/19 17:23:31 UTC

svn commit: r669504 - /geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java

Author: linsun
Date: Thu Jun 19 08:23:31 2008
New Revision: 669504

URL: http://svn.apache.org/viewvc?rev=669504&view=rev
Log:
GERONIMO-3971 - Error message during assembling a server

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=669504&r1=669503&r2=669504&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Thu Jun 19 08:23:31 2008
@@ -603,7 +603,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 {