[jboss-cvs] JBossAS SVN: r107585 - projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 13 06:12:44 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-08-13 06:12:43 -0400 (Fri, 13 Aug 2010)
New Revision: 107585
Modified:
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java
Log:
[JBAOP-798] Privileged block in ClassProxyFactory.populateMethodTables()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2010-08-13 10:10:46 UTC (rev 107584)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2010-08-13 10:12:43 UTC (rev 107585)
@@ -391,7 +391,7 @@
return;
};
- Method[] declaredMethods = superclass.getDeclaredMethods();
+ Method[] declaredMethods = SecurityActions.getDeclaredMethods(superclass);
for (int i = 0; i < declaredMethods.length; i++)
{
if (ClassAdvisor.isAdvisable(declaredMethods[i]))
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java 2010-08-13 10:10:46 UTC (rev 107584)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java 2010-08-13 10:12:43 UTC (rev 107585)
@@ -198,4 +198,40 @@
return GetClassLoaderAction.PRIVILEGED.getClassLoader(clazz);
}
}
+
+ interface GetDeclaredMethodsAction
+ {
+ Method[] getDeclaredMethods(Class<?> clazz);
+
+ GetDeclaredMethodsAction NON_PRIVILEGED = new GetDeclaredMethodsAction() {
+
+ public Method[] getDeclaredMethods(Class<?> clazz)
+ {
+ return clazz.getDeclaredMethods();
+ }};
+
+ GetDeclaredMethodsAction PRIVILEGED = new GetDeclaredMethodsAction() {
+
+ public Method[] getDeclaredMethods(final Class<?> clazz)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
+
+ public Method[] run()
+ {
+ return clazz.getDeclaredMethods();
+ }});
+ }};
+ }
+
+ static Method[] getDeclaredMethods(Class<?> clazz)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return GetDeclaredMethodsAction.NON_PRIVILEGED.getDeclaredMethods(clazz);
+ }
+ else
+ {
+ return GetDeclaredMethodsAction.PRIVILEGED.getDeclaredMethods(clazz);
+ }
+ }
}
More information about the jboss-cvs-commits
mailing list