svn commit: r785406 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java

[pa...@apache.org]

Author: pauls
Date: Tue Jun 16 21:14:37 2009
New Revision: 785406

URL: http://svn.apache.org/viewvc?rev=785406&view=rev
Log:
Fix a memory leak when stopping and restarting felix by using weakreferences inside the bundle protection domain. (FELIX-1170)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java?rev=785406&r1=785405&r2=785406&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java Tue Jun 16 21:14:37 2009
@@ -18,6 +18,7 @@
  */
 package org.apache.felix.framework;
 
+import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.CodeSource;
@@ -27,8 +28,10 @@
 
 public class BundleProtectionDomain extends ProtectionDomain
 {
-    private final Felix m_felix;
-    private final BundleImpl m_bundle;
+    private final WeakReference m_felix;
+    private final WeakReference m_bundle;
+    private final int m_hashCode;
+    private final String m_toString;
 
     // TODO: SECURITY - This should probably take a module, not a bundle.
     BundleProtectionDomain(Felix felix, BundleImpl bundle)
@@ -37,41 +40,51 @@
         super(new CodeSource(new URL(new URL(null, "location:", 
             new FakeURLStreamHandler()), bundle._getLocation(),
             new FakeURLStreamHandler()), (Certificate[]) null), null);
-        m_felix = felix;
-        m_bundle = bundle;
+        m_felix = new WeakReference(felix);
+        m_bundle = new WeakReference(bundle);
+        m_hashCode = bundle.hashCode();
+        m_toString = "[" + bundle + "]";
     }
 
     public boolean implies(Permission permission)
     {
-        return m_felix.impliesBundlePermission(this, permission, false);
+        Felix felix = (Felix) m_felix.get();
+        return (felix != null) ? 
+            felix.impliesBundlePermission(this, permission, false) : false;
     }
 
     public boolean impliesDirect(Permission permission)
     {
-        return m_felix.impliesBundlePermission(this, permission, true);
+        Felix felix = (Felix) m_felix.get();
+        return (felix != null) ? 
+            felix.impliesBundlePermission(this, permission, true) : false;
     }
 
     BundleImpl getBundle()
     {
-        return m_bundle;
+        return (BundleImpl) m_bundle.get();
     }
 
     public int hashCode()
     {
-        return m_bundle.hashCode();
+        return m_hashCode;
     }
 
     public boolean equals(Object other)
     {
-        if ((other == null) || other.getClass() != BundleProtectionDomain.class)
+        if ((other == null) || (other.getClass() != BundleProtectionDomain.class))
         {
             return false;
         }
-        return m_bundle == ((BundleProtectionDomain) other).m_bundle;
+        if (m_hashCode != other.hashCode())
+        {
+            return false;
+        }
+        return m_bundle.get() == ((BundleProtectionDomain) other).m_bundle.get();
     }
 
     public String toString()
     {
-        return "[" + m_bundle + "]";
+        return m_toString;
     }
 }
\ No newline at end of file