commit b25144be61b99c1ab4687bd19d4c4e6b68df00ae
author Rob Walker <walkerr@apache.org> Wed Oct 12 13:41:32 2011 +0000
committer Rob Walker <walkerr@apache.org> Wed Oct 12 13:41:32 2011 +0000
tree 7bf1bcada2b9bc94e8c2c1575b8c5404a3832d55
parent 31d8ac70262090b501a75a24ec43d58c6e975219

Null pointer check in close method (FELIX-3160)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1182359 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
index 7e184cc..c9f3273 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
@@ -636,7 +636,12 @@
             ((BundleImpl) m_bundle).getFramework().getLogger().log(
                 Logger.LOG_ERROR, "Error releasing revision: " + ex.getMessage(), ex);
         }
-        m_content.close();
+        
+        if (m_content != null)
+        {
+            m_content.close();
+        }
+        
         m_content = null;
         for (int i = 0; (m_contentPath != null) && (i < m_contentPath.size()); i++)
         {