svn commit: r955538 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java

[marrs]

Author: marrs
Date: Thu Jun 17 10:17:47 2010
New Revision: 955538

URL: http://svn.apache.org/viewvc?rev=955538&view=rev
Log:
Method to access compositions of instances was not "proxy aware" because it did 
not yet use our InvocationUtil method. Now it does, and is.

Modified:
    
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java

Modified: 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java?rev=955538&r1=955537&r2=955538&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
 Thu Jun 17 10:17:47 2010
@@ -20,7 +20,6 @@ package org.apache.felix.dm.impl;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Dictionary;
@@ -915,9 +914,7 @@ public class ServiceImpl implements Serv
             }
             if (m_compositionManagerInstance != null) {
                 try {
-                    Method m = 
m_compositionManagerInstance.getClass().getDeclaredMethod(m_compositionManagerGetMethod,
 null);
-                    m.setAccessible(true);
-                    instances = (Object[]) 
m.invoke(m_compositionManagerInstance, null);
+                    instances = (Object[]) 
InvocationUtil.invokeMethod(m_compositionManagerInstance, 
m_compositionManagerInstance.getClass(), m_compositionManagerGetMethod, new 
Class[][] {{}}, new Object[][] {{}}, false);
                 }
                 catch (Exception e) {
                     m_logger.log(Logger.LOG_ERROR, "Could not obtain instances 
from the composition manager.", e);