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

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

Author: pskopek at redhat.com
Date: 2014-03-14 11:48:52 -0400 (Fri, 14 Mar 2014)
New Revision: 523

Modified:
   trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java
   trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java
Log:
[SECURITY-805] additional tweaks by Kabir

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java	2014-03-14 14:26:19 UTC (rev 522)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java	2014-03-14 15:48:52 UTC (rev 523)
@@ -68,26 +68,15 @@
       {
          public Class<?> run()
          {
-            Class<?> loadedClass = null;
             try
             {
-               loadedClass = classLoader.loadClass(fqn);
+               return classLoader.loadClass(fqn);
             }
             catch (ClassNotFoundException e)
             {
             }
-            if(loadedClass == null)
-            {
-               try
-               {
-                  loadedClass = Thread.currentThread().getContextClassLoader().loadClass(fqn);
-               }
-               catch (ClassNotFoundException e)
-               {
-               }
-            }
-            return loadedClass;
+            return null;
          }
       });
    }
-}
\ No newline at end of file
+}

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java	2014-03-14 14:26:19 UTC (rev 522)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java	2014-03-14 15:48:52 UTC (rev 523)
@@ -87,13 +87,16 @@
     */
    public static SecurityVault get(ClassLoader classLoader, String fqn) throws SecurityVaultException
    {
+         if (classLoader == null){
+            throw PicketBoxMessages.MESSAGES.invalidNullArgument("classLoader");
+         }
+         if (fqn == null){
+            throw PicketBoxMessages.MESSAGES.invalidNullArgument("fqn");
+         }
 	      SecurityManager sm = System.getSecurityManager();
 	      if (sm != null) {
 	         sm.checkPermission(new RuntimePermission(SecurityVaultFactory.class.getName() + ".get"));
 	      }
-	      if(fqn == null)
-	         return get();
-
 	      if(vault == null)
 	      {
 	         Class<?> vaultClass = SecurityActions.loadClass(classLoader,fqn);