You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2016/10/21 20:40:21 UTC

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

Author: pauls
Date: Fri Oct 21 20:40:21 2016
New Revision: 1766122

URL: http://svn.apache.org/viewvc?rev=1766122&view=rev
Log:
[FELIX-5384] EventDispatcher#createWhitelistFromHooks fails under security

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/DTOFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/DTOFactory.java?rev=1766122&r1=1766121&r2=1766122&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/DTOFactory.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/DTOFactory.java Fri Oct 21 20:40:21 2016
@@ -314,7 +314,7 @@ public class DTOFactory
 
     private static ServiceReferenceDTO[] createServiceReferenceDTOArray(Bundle bundle)
     {
-        BundleContext ctx = bundle.getBundleContext();
+        BundleContext ctx = ((BundleImpl) bundle)._getBundleContext();
         if (ctx == null)
             return null;
 

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=1766122&r1=1766121&r2=1766122&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 Fri Oct 21 20:40:21 2016
@@ -3126,7 +3126,7 @@ public class Felix extends BundleImpl im
                         try
                         {
                             m_secureAction.invokeBundleFindHook(
-                                fh, origin.getBundleContext(), bundles);
+                                fh, ((BundleImpl) origin)._getBundleContext(), bundles);
                         }
                         catch (Throwable th)
                         {