Fixed a NPE that was caused when readLine() improperly returned a null.
(FELIX-525)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@654615 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/src/main/java/org/apache/felix/main/Main.java b/main/src/main/java/org/apache/felix/main/Main.java
index 8b56bac..09ab34c 100644
--- a/main/src/main/java/org/apache/felix/main/Main.java
+++ b/main/src/main/java/org/apache/felix/main/Main.java
@@ -202,7 +202,14 @@
System.exit(-1);
}
System.out.println("");
- if (profileName.length() != 0)
+
+ // On some platforms readLine() can return null, such as when
+ // control-C is pressed, so check for that case.
+ if (profileName == null)
+ {
+ profileName = "";
+ }
+ else if (profileName.length() != 0)
{
configProps.setProperty(BundleCache.CACHE_PROFILE_PROP, profileName);
}