felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r1203588 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
Date Fri, 18 Nov 2011 10:57:10 GMT
Author: pauls
Date: Fri Nov 18 10:57:10 2011
New Revision: 1203588

URL: http://svn.apache.org/viewvc?rev=1203588&view=rev
Log:
Changing the method of setting the arguments for the SecureAction class for some of the hook
callbacks as they where wrong and hence, causing classcast exceptions when security is enabled.
(FELIX-3220)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java?rev=1203588&r1=1203587&r2=1203588&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
Fri Nov 18 10:57:10 2011
@@ -1132,7 +1132,7 @@ public class SecureAction
         if (System.getSecurityManager() != null)
         {
             Actions actions = (Actions) m_actions.get();
-            actions.set(Actions.INVOKE_SERVICE_EVENT_HOOK, eh, contexts);
+            actions.set(Actions.INVOKE_SERVICE_EVENT_HOOK, eh, event, contexts);
             try
             {
                 AccessController.doPrivileged(actions, m_acc);
@@ -1158,7 +1158,7 @@ public class SecureAction
         {
             Actions actions = (Actions) m_actions.get();
             actions.set(
-                Actions.INVOKE_SERVICE_EVENT_HOOK, fh, context, name, filter,
+                Actions.INVOKE_SERVICE_FIND_HOOK, fh, context, name, filter,
                 (allServices) ? Boolean.TRUE : Boolean.FALSE, references);
             try
             {
@@ -1232,7 +1232,7 @@ public class SecureAction
         if (System.getSecurityManager() != null)
         {
             Actions actions = (Actions) m_actions.get();
-            actions.set(Actions.INVOKE_SERVICE_EVENT_LISTENER_HOOK, elh, listeners);
+            actions.set(Actions.INVOKE_SERVICE_EVENT_LISTENER_HOOK, elh, event, listeners);
             try
             {
                 AccessController.doPrivileged(actions, m_acc);



Mime
View raw message