svn commit: r598080 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

[pa...@apache.org]

Author: pauls
Date: Sun Nov 25 15:08:12 2007
New Revision: 598080

URL: http://svn.apache.org/viewvc?rev=598080&view=rev
Log:
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.

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=598080&r1=598079&r2=598080&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Sun Nov 25 15:08:12 2007
@@ -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("-"), '.');