Degrate to version 0.0.0 if we can not find the Felix.properties for some reason and avoid a null pointer in this case.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@598080 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index e6505ec..8b3c641 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -3590,13 +3590,16 @@
// The framework version property.
Properties props = new Properties();
InputStream in = Felix.class.getResourceAsStream("Felix.properties");
- try
+ if (in != null)
{
- props.load(in);
- }
- catch (IOException ex)
- {
- ex.printStackTrace();
+ try
+ {
+ props.load(in);
+ }
+ catch (IOException ex)
+ {
+ ex.printStackTrace();
+ }
}
// Maven uses a '-' to separate the version qualifier,
@@ -3604,7 +3607,7 @@
StringBuffer sb =
new StringBuffer(
props.getProperty(
- FelixConstants.FELIX_VERSION_PROPERTY, "unknown"));
+ FelixConstants.FELIX_VERSION_PROPERTY, "0.0.0"));
if (sb.toString().indexOf("-") >= 0)
{
sb.setCharAt(sb.toString().indexOf("-"), '.');