From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 13 Dec 2011 16:26:51 +0000 (+0000)
Subject: Fix NPE issue
X-Git-Tag: argeo-commons-2.1.30~1047
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=47c930a22d887da76814cb9cf6c1df975d1639a2;p=lgpl%2Fargeo-commons.git

Fix NPE issue

git-svn-id: https://svn.argeo.org/commons/trunk@4947 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 94fccdcee..276e13c79 100644
--- 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
@@ -636,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;
 			}