geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1063294 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Date Tue, 25 Jan 2011 14:22:40 GMT
Author: rickmcguire
Date: Tue Jan 25 14:22:40 2011
New Revision: 1063294

URL: http://svn.apache.org/viewvc?rev=1063294&view=rev
Log:
fix NPE during build caused by cache clearing changes

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1063294&r1=1063293&r2=1063294&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Tue Jan 25 14:22:40 2011
@@ -67,7 +67,12 @@ public class EmbeddedDaemon implements M
     static {
         
         String CACHES_TO_CLEAN_STRING= System.getProperty("directorys.to.remove.on.start");
-        CACHES_TO_CLEAN = CACHES_TO_CLEAN_STRING.split(",");
+        if (CACHES_TO_CLEAN_STRING != null) {
+            CACHES_TO_CLEAN = CACHES_TO_CLEAN_STRING.split(",");
+        }
+        else {
+            CACHES_TO_CLEAN = new String[0];
+        }
     }
 
     public EmbeddedDaemon(Kernel kernel, Bundle bundle) {



Mime
View raw message