svn commit: r1827750 - /openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java

[rmannibucau]

Author: rmannibucau
Date: Mon Mar 26 09:30:09 2018
New Revision: 1827750

URL: http://svn.apache.org/viewvc?rev=1827750&view=rev
Log:
MEECROWAVE-108 patch from Manfred Huber to avoid NPE when base is not yet 
initialized but dir is set using the CLI

Modified:
    
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java

Modified: 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1827750&r1=1827749&r2=1827750&view=diff
==============================================================================
--- 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 (original)
+++ 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 Mon Mar 26 09:30:09 2018
@@ -993,7 +993,7 @@ public class Meecrowave implements AutoC
         if (dir != null) {
             final File dirFile = new File(dir);
             if (dirFile.exists()) {
-                if (base.exists() && configuration.deleteBaseOnStartup) {
+                if (base != null && base.exists() && 
configuration.deleteBaseOnStartup) {
                     IO.delete(base);
                 }
                 return dir;