[jboss-cvs] JBossAS SVN: r73390 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login.

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

Author: anil.saldhana at jboss.com
Date: 2008-05-14 04:37:09 -0400 (Wed, 14 May 2008)
New Revision: 73390

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/SecurityActions.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java
Log:
minor fix

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/SecurityActions.java	2008-05-14 07:35:45 UTC (rev 73389)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/SecurityActions.java	2008-05-14 08:37:09 UTC (rev 73390)
@@ -24,7 +24,6 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-//$Id$
 
 /**
  *  Privileged Blocks
@@ -36,12 +35,12 @@
 {
    static ClassLoader getContextClassLoader()
    {
-      return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
       { 
-         public Object run()
+         public ClassLoader run()
          { 
             return Thread.currentThread().getContextClassLoader();
          }
        });  
    } 
-}
+}
\ No newline at end of file

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java	2008-05-14 07:35:45 UTC (rev 73389)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java	2008-05-14 08:37:09 UTC (rev 73390)
@@ -165,9 +165,9 @@
             log.trace("End getAppConfigurationEntry(" + appName + "), authInfo=" + authInfo);
          // Make a copy of the authInfo object
          final AuthenticationInfo theAuthInfo = authInfo;
-         PrivilegedAction action = new PrivilegedAction()
+         PrivilegedAction<AppConfigurationEntry[]> action = new PrivilegedAction<AppConfigurationEntry[]>()
          {
-            public Object run()
+            public AppConfigurationEntry[] run()
             {
                return theAuthInfo.copyAppConfigurationEntry();
             }
@@ -274,6 +274,7 @@
       if (log.isTraceEnabled())
          log.trace("removeAppConfig, appName=" + appName);
       appConfigs.remove(appName);
+      SecurityConfiguration.removeApplicationPolicy(appName);
    }
 
    /**
@@ -300,6 +301,7 @@
       if (log.isTraceEnabled())
          log.trace("removeAppConfig, appName=" + appName);
       appConfigs.remove(appName);
+      SecurityConfiguration.removeApplicationPolicy(appName);
       return true;
    }
 
@@ -382,6 +384,7 @@
       }
    }
 
+   @SuppressWarnings("unchecked")
    protected String[] loadConfig(URL config) throws Exception
    {
       SecurityManager sm = System.getSecurityManager();
@@ -424,6 +427,7 @@
       }
    }
 
+   @SuppressWarnings("unchecked")
    private void loadSunConfig(URL sunConfig, ArrayList configNames) throws Exception
    {
       InputStream is = sunConfig.openStream();
@@ -435,6 +439,7 @@
       SunConfigParser.doParse(configFile, this, trace);
    }
 
+   @SuppressWarnings("unchecked")
    private void loadXMLConfig(URL loginConfigURL, ArrayList configNames) throws IOException, JBossXBException
    {
       LoginConfigObjectModelFactory lcomf = new SecurityConfigObjectModelFactory();