You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/01/29 17:43:59 UTC
svn commit: r738920 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Author: rickhall
Date: Thu Jan 29 16:43:58 2009
New Revision: 738920
URL: http://svn.apache.org/viewvc?rev=738920&view=rev
Log:
Fix an NPE issue if state file is empty. (FELIX-902)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?rev=738920&r1=738919&r2=738920&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java Thu Jan 29 16:43:58 2009
@@ -309,11 +309,11 @@
.getFileInputStream(stateFile);
br = new BufferedReader(new InputStreamReader(is));
String s = br.readLine();
- if (s.equals(ACTIVE_STATE))
+ if ((s != null) && s.equals(ACTIVE_STATE))
{
m_persistentState = Bundle.ACTIVE;
}
- else if (s.equals(UNINSTALLED_STATE))
+ else if ((s != null) && s.equals(UNINSTALLED_STATE))
{
m_persistentState = Bundle.UNINSTALLED;
}
@@ -343,7 +343,7 @@
{
// Write the bundle state.
OutputStream os = null;
- BufferedWriter bw= null;
+ BufferedWriter bw = null;
try
{
os = BundleCache.getSecureAction()