[jboss-cvs] JBossAS SVN: r88890 - branches/Branch_5_x/security/src/main/org/jboss/security/integration.

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

Author: anil.saldhana at jboss.com
Date: 2009-05-14 15:13:50 -0400 (Thu, 14 May 2009)
New Revision: 88890

Modified:
   branches/Branch_5_x/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
Log:
JBAS-6747: clean up the wrong code

Modified: branches/Branch_5_x/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
===================================================================
--- branches/Branch_5_x/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java	2009-05-14 18:56:08 UTC (rev 88889)
+++ branches/Branch_5_x/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java	2009-05-14 19:13:50 UTC (rev 88890)
@@ -29,8 +29,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.jacc.PolicyContext;
-import javax.security.jacc.PolicyContextException;
 
 import org.jboss.logging.Logger;
 import org.jboss.managed.api.annotation.ManagementComponent;
@@ -45,7 +43,6 @@
 import org.jboss.security.ISecurityManagement;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.audit.AuditManager;
-import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
 import org.jboss.security.auth.callback.JBossCallbackHandler;
 import org.jboss.security.config.SecurityConfiguration;
 import org.jboss.security.identitytrust.IdentityTrustManager;
@@ -565,19 +562,6 @@
             throw new RuntimeException("Error initializing JNDIBasedSecurityManagement:",e);
          }
       }
-      else
-      {
-         try
-         {
-            CallbackHandler cbhandler = 
-               (CallbackHandler) PolicyContext.getContext(CallbackHandlerPolicyContextHandler.CALLBACK_HANDLER_KEY);
-            if(cbhandler instanceof JBossCallbackHandler == false)
-               callBackHandler = cbhandler;
-         }
-         catch (PolicyContextException ignore)
-         {
-         }
-      }
       if(callBackHandler == null)
          callBackHandler = new JBossCallbackHandler();
    }