commit 245e76afe438f14e82c394c53a5062bd7d43dfde
author Karl Pauls <pauls@apache.org> Fri Nov 18 10:57:10 2011 +0000
committer Karl Pauls <pauls@apache.org> Fri Nov 18 10:57:10 2011 +0000
tree 08c6456b8acb681a17f26156bd08445a10120b2c
parent db301869edb64b84c7be33ed7151162b42661e69

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)

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

framework/src/main/java/org/apache/felix/framework/util/SecureAction.java

diff --git a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
index 50d3a13..c116b72 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
@@ -1132,7 +1132,7 @@
         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 @@
         {
             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 @@
         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);