[jboss-cvs] Picketbox SVN: r447 - trunk/security-spi/spi/src/main/java/org/jboss/security.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2013-09-04 09:51:57 -0400 (Wed, 04 Sep 2013)
New Revision: 447

Modified:
   trunk/security-spi/spi/src/main/java/org/jboss/security/SecuritySPIActions.java
Log:
Skip privileged block if the SecurityManager is not enabled

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/SecuritySPIActions.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/SecuritySPIActions.java	2013-09-04 13:48:24 UTC (rev 446)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/SecuritySPIActions.java	2013-09-04 13:51:57 UTC (rev 447)
@@ -34,13 +34,18 @@
 {  
    static ClassLoader getContextClassLoader()
    {
-      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() 
+      if (System.getSecurityManager() != null)
       {
-         public ClassLoader run()
+         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
          {
-           return Thread.currentThread().getContextClassLoader();
-         }
-      });
+            public ClassLoader run()
+            {
+              return Thread.currentThread().getContextClassLoader();
+            }
+         });
+      }
+      else
+         return Thread.currentThread().getContextClassLoader();
    }
    
    static ClassLoader getCurrentClassLoader(final Class clazz)
@@ -56,6 +61,6 @@
          });
       }
       else
-         return Thread.currentThread().getContextClassLoader();
+         return clazz.getClassLoader();
    }
 }
\ No newline at end of file