Fix NPE issue

[lgpl/argeo-commons.git] / osgi / runtime / org.argeo.osgi.boot / src / main / java / org / argeo / osgi / boot / OsgiBoot.java

diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
index 029801b2e2932cc12831933e7cb49cc5610cc31d..276e13c79a0fe45cd9e19a4bdf86258ed354bbee 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
@@ -94,10 +94,11 @@ public class OsgiBoot {
         * (last part of the URL). The goal is to stay closer from Eclipse PDE way
         * of installing target platform bundles.
         */
-       private boolean installInLexicographicOrder = Boolean.valueOf(
-                       System.getProperty(
-                                       PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER,
-                                       "false")).booleanValue();;
+       private boolean installInLexicographicOrder = Boolean
+                       .valueOf(
+                                       System.getProperty(
+                                                       PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER,
+                                                       "true")).booleanValue();;
 
        /** Default is 10s (set in constructor) */
        private long defaultTimeout;
@@ -635,10 +636,11 @@ public class OsgiBoot {
                        File baseDir = new File(base.replace('/', File.separatorChar));
                        File[] files = baseDir.listFiles();
 
-                       if (files == null && debug) {
-                               OsgiBootUtils.warn("Base dir " + baseDir
-                                               + " has no children, exists=" + baseDir.exists()
-                                               + ", isDirectory=" + baseDir.isDirectory());
+                       if (files == null) {
+                               if (debug)
+                                       OsgiBootUtils.warn("Base dir " + baseDir
+                                                       + " has no children, exists=" + baseDir.exists()
+                                                       + ", isDirectory=" + baseDir.isDirectory());
                                return;
                        }
 
@@ -793,6 +795,14 @@ public class OsgiBoot {
                this.modulesUrlSeparator = modulesUrlSeparator;
        }
 
+       public boolean isExcludeSvn() {
+               return excludeSvn;
+       }
+
+       public void setExcludeSvn(boolean excludeSvn) {
+               this.excludeSvn = excludeSvn;
+       }
+
        /*
         * INTERNAL CLASSES
         */