commit b63b45c335a74f4aa857e2927a88cdcc065d1c22
author Richard S. Hall <rickhall@apache.org> Tue Feb 03 15:39:49 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Tue Feb 03 15:39:49 2009 +0000
tree ebc4d912fde8268452b3923957287014e8c0bb74
parent f44c4995c876393f39799b0c53821073cf674ff1

Modified PackageAdmin.getBundle(Class) to return the system bundle for
packages exported by the system bundle; this had previously been the case
until Felix 1.4.0, not sure why it changed. (FELIX-915)


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

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

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 f15ad1b..f24d4df 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -2641,7 +2641,15 @@
                 }
             }
         }
-        return null;
+        try
+        {
+            return (m_extensionManager.getModule().getClassByDelegation(clazz.getName()) == clazz)
+                ? this : null;
+        }
+        catch(ClassNotFoundException ex)
+        {
+            return null;
+        }
     }
 
     /**