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 2011/08/02 23:29:13 UTC

svn commit: r1153276 - in /felix/trunk/framework/src/main/java/org/apache/felix/framework: BundleWiringImpl.java Felix.java

Author: rickhall
Date: Tue Aug  2 21:29:12 2011
New Revision: 1153276

URL: http://svn.apache.org/viewvc?rev=1153276&view=rev
Log:
Exported package filter directives should only impact bundle to
bundle delegation, not Bundle.loadClass(). (FELIX-2950)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1153276&r1=1153275&r2=1153276&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Tue Aug  2 21:29:12 2011
@@ -1271,7 +1271,7 @@ public class BundleWiringImpl implements
            dexFileClassLoadClass = null;
         }
         m_dexFileClassConstructor = dexFileClassConstructor;
-        m_dexFileClassLoadDex= dexFileClassLoadDex;
+        m_dexFileClassLoadDex = dexFileClassLoadDex;
         m_dexFileClassLoadClass = dexFileClassLoadClass;
     }
 

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=1153276&r1=1153275&r2=1153276&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 Tue Aug  2 21:29:12 2011
@@ -66,6 +66,7 @@ import org.osgi.framework.startlevel.Fra
 import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleRevisions;
+import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.framework.wiring.FrameworkWiring;
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.startlevel.StartLevel;
@@ -1741,7 +1742,7 @@ public class Felix extends BundleImpl im
             }
         }
         return ((BundleWiringImpl)
-            bundle.adapt(BundleRevision.class).getWiring()).getClassByDelegation(name);
+            bundle.adapt(BundleWiring.class)).getClassLoader().loadClass(name);
     }
 
     /**