You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/07/11 17:20:24 UTC
svn commit: r1360226 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
Author: struberg
Date: Wed Jul 11 15:20:24 2012
New Revision: 1360226
URL: http://svn.apache.org/viewvc?rev=1360226&view=rev
Log:
OWB-549 avoid doPrivileged if no SecurityManger is available
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java?rev=1360226&r1=1360225&r2=1360226&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java Wed Jul 11 15:20:24 2012
@@ -32,6 +32,11 @@ public class SecurityUtil
public static <T> Method[] doPrivilegedGetDeclaredMethods(Class<T> clazz)
{
+ if (System.getSecurityManager() == null)
+ {
+ return clazz.getDeclaredMethods();
+ }
+
Object obj = AccessController.doPrivileged(
new PrivilegedActionForClass(clazz, null, METHOD_CLASS_GETDECLAREDMETHODS));
return (Method[])obj;
@@ -62,8 +67,14 @@ public class SecurityUtil
public static Class<?> doPrivilegedCreateClass(ProxyFactory factory)
{
- Class<?> ret = (Class<?>)AccessController.doPrivileged(new PrivilegedActionForProxyFactory(factory));
- return ret;
+ if (System.getSecurityManager() == null)
+ {
+ return factory.createClass();
+ }
+ else
+ {
+ return (Class<?>)AccessController.doPrivileged(new PrivilegedActionForProxyFactory(factory));
+ }
}