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

Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/02/20 17:13:52 UTC

svn commit: r1291341 - /geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java

Author: xiaming
Date: Mon Feb 20 16:13:51 2012
New Revision: 1291341

URL: http://svn.apache.org/viewvc?rev=1291341&view=rev
Log:
GERONIMO-6282 Test if the repository folder of the new instance exists to avoid NPE, for trunk

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

Modified: geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java?rev=1291341&r1=1291340&r2=1291341&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java Mon Feb 20 16:13:51 2012
@@ -456,6 +456,12 @@ public class FrameworkLauncher {
     }
 
     private static File findFile(File dir, String name) {
+        if (!dir.exists()) dir.mkdir();
+        if (!dir.isDirectory()) {
+            dir.delete();
+            dir.mkdir();
+        }
+        
         File theFile = new File(dir, name);
 
         if (theFile.exists() && !theFile.isDirectory()) {