You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/01/21 22:07:27 UTC

svn commit: r1234416 - in /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2: AccessibleObjectsRegistry.java MakeAccessiblePrivilegedAction.java

Author: simonetripodi
Date: Sat Jan 21 21:07:27 2012
New Revision: 1234416

URL: http://svn.apache.org/viewvc?rev=1234416&view=rev
Log:
centralized the point where AccessibleObject is made accessible via PrivilegedAction - it will work for Method as well without the need of setting it explicitly

Removed:
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/MakeAccessiblePrivilegedAction.java
Modified:
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java?rev=1234416&r1=1234415&r2=1234416&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java Sat Jan 21 21:07:27 2012
@@ -17,14 +17,16 @@ package org.apache.commons.beanutils2;
  * limitations under the License.
  */
 
+import static java.lang.System.getSecurityManager;
 import static java.lang.reflect.Modifier.isPublic;
-import static org.apache.commons.beanutils2.MakeAccessiblePrivilegedAction.makeAccessible;
+import static java.security.AccessController.doPrivileged;
 import static org.apache.commons.beanutils2.TypeUtils.isAssignmentCompatible;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -81,6 +83,7 @@ abstract class AccessibleObjectsRegistry
         try
         {
             AO accessibleObject = resolve( exact, type, methodName, parameterTypes );
+            accessibleObject = makeAccessible( accessibleObject );
             cache.put( key, new WeakReference<AO>( accessibleObject ) );
             return accessibleObject;
         }
@@ -90,6 +93,16 @@ abstract class AccessibleObjectsRegistry
         }
     }
 
+    private AO makeAccessible( AO accessibleObject )
+    {
+        PrivilegedAction<AO> action = new MakeAccessiblePrivilegedAction<AO>( accessibleObject );
+        if ( getSecurityManager() != null )
+        {
+            return doPrivileged( action );
+        }
+        return action.run();
+    }
+
     protected abstract AO resolve( boolean exact, Class<?> cls, String methodName, Class<?>... paramTypes );
 
     /**
@@ -179,7 +192,7 @@ abstract class AccessibleObjectsRegistry
             Class<T> beanClass = ctor.getDeclaringClass();
             if ( isPublic( beanClass.getModifiers() ) )
             {
-                return makeAccessible( ctor );
+                return ctor;
             }
 
             // what else can we do?
@@ -268,4 +281,38 @@ abstract class AccessibleObjectsRegistry
 
     }
 
+    private static class MakeAccessiblePrivilegedAction<T extends AccessibleObject>
+        implements PrivilegedAction<T>
+    {
+
+        private final T accessibleObject;
+
+        /**
+         * hidden constructor, this class cannot be instantiated directly
+         */
+        private MakeAccessiblePrivilegedAction( T accessibleObject )
+        {
+            this.accessibleObject = accessibleObject;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public T run()
+        {
+            try
+            {
+                accessibleObject.setAccessible( true );
+            }
+            catch ( SecurityException se )
+            {
+                /*
+                 * Swallow SecurityException TODO: Why?
+                 */
+            }
+            return accessibleObject;
+        }
+
+    }
+
 }