[KARAF-2058]add NPE guard

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1421685 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 14, 2012 · a5ab55a · a5ab55a
1 parent 2f0af31
commit a5ab55a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/main/src/main/java/org/apache/karaf/main/InstanceHelper.java b/main/src/main/java/org/apache/karaf/main/InstanceHelper.java
@@ -65,7 +65,7 @@ static void updateInstancePid(File karafHome, File karafBase) {
                             //looking for root instance entry
                             String name = props.getProperty("item." + i + ".name");
                             boolean root = Boolean.parseBoolean(props.getProperty("item." + i + ".root", "false"));
-                            if (root && !name.equals(instanceName)) {
+                            if (name != null && root && !name.equals(instanceName)) {
                                 props.setProperty("item." + i + ".name", instanceName);
                             }
                         }