You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2007/07/13 14:07:40 UTC
svn commit: r555962 -
/felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
Author: marrs
Date: Fri Jul 13 05:07:39 2007
New Revision: 555962
URL: http://svn.apache.org/viewvc?view=rev&rev=555962
Log:
Karl pointed out I used the wrong way to make stuff accessible again. Sorry for that! :)
Modified:
felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
Modified: felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java?view=diff&rev=555962&r1=555961&r2=555962
==============================================================================
--- felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java (original)
+++ felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java Fri Jul 13 05:07:39 2007
@@ -18,7 +18,6 @@
*/
package org.apache.felix.dependencymanager;
-import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -443,7 +442,7 @@
try {
Method method = clazz.getDeclaredMethod(name, null);
if (method != null) {
- AccessibleObject.setAccessible(new AccessibleObject[] { method }, true);
+ method.setAccessible(true);
method.invoke(m_serviceInstance, null);
return;
}
@@ -502,7 +501,7 @@
private Object createInstance(Class clazz) throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException {
Constructor constructor = clazz.getConstructor(VOID);
- AccessibleObject.setAccessible(new AccessibleObject[] { constructor }, true);
+ constructor.setAccessible(true);
return clazz.newInstance();
}
@@ -701,7 +700,7 @@
if (m_compositionManagerInstance != null) {
try {
Method m = m_compositionManagerInstance.getClass().getDeclaredMethod(m_compositionManagerGetMethod, null);
- AccessibleObject.setAccessible(new AccessibleObject[] { m }, true);
+ m.setAccessible(true);
instances = (Object[]) m.invoke(m_compositionManager, null);
}
catch (Exception e) {
@@ -719,10 +718,10 @@
Class serviceClazz = serviceInstance.getClass();
while (serviceClazz != null) {
Field[] fields = serviceClazz.getDeclaredFields();
- AccessibleObject.setAccessible(fields, true);
for (int j = 0; j < fields.length; j++) {
if (fields[j].getType().equals(clazz)) {
try {
+ fields[j].setAccessible(true);
// synchronized makes sure the field is actually written to immediately
synchronized (new Object()) {
fields[j].set(serviceInstance, instance);