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 17:17:26 UTC

svn commit: r1153161 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java

Author: rickhall
Date: Tue Aug  2 15:17:25 2011
New Revision: 1153161

URL: http://svn.apache.org/viewvc?rev=1153161&view=rev
Log:
Invoke bundle hooks in privileged block; missed one. (FELIX-3032)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java?rev=1153161&r1=1153160&r2=1153161&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java Tue Aug  2 15:17:25 2011
@@ -76,6 +76,8 @@ public class EventDispatcher
     // Pooled requests to avoid memory allocation.
     private static final List<Request> m_requestPool = new ArrayList<Request>();
 
+    private static final SecureAction m_secureAction = new SecureAction();
+
     public EventDispatcher(Logger logger, ServiceRegistry registry)
     {
         m_logger = logger;
@@ -668,8 +670,9 @@ public class EventDispatcher
                             }
                             else if (eh instanceof org.osgi.framework.hooks.bundle.EventHook)
                             {
-                                ((org.osgi.framework.hooks.bundle.EventHook)
-                                    eh).event((BundleEvent) event, shrinkable);
+                                m_secureAction.invokeBundleEventHook(
+                                    (org.osgi.framework.hooks.bundle.EventHook) eh,
+                                    (BundleEvent) event, shrinkable);
                             }
                         }
                         catch (Throwable th)