[jboss-cvs] JBossAS SVN: r108963 - in projects/security/security-negotiation/trunk: jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation and 2 other directories.

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

Author: darran.lofthouse at jboss.com
Date: 2010-10-28 09:52:33 -0400 (Thu, 28 Oct 2010)
New Revision: 108963

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/MessageFactory.java
   projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java
   projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/SecurityDomainTestServlet.java
Log:
Removed reduntant logging checks.

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/MessageFactory.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/MessageFactory.java	2010-10-28 12:30:28 UTC (rev 108962)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/MessageFactory.java	2010-10-28 13:52:33 UTC (rev 108963)
@@ -65,8 +65,7 @@
       }
       catch (Exception e)
       {
-         if (log.isTraceEnabled())
-            log.trace("Unable to load class '" + classname + "'", e);
+         log.trace("Unable to load class '" + classname + "'", e);
       }
 
       return clazz;

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java	2010-10-28 12:30:28 UTC (rev 108962)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java	2010-10-28 13:52:33 UTC (rev 108963)
@@ -63,9 +63,9 @@
    protected boolean authenticate(final Request request, final Response response, final LoginConfig config)
          throws IOException
    {
-      if (log.isTraceEnabled())
-         log.trace("Authenticating user");
 
+      log.trace("Authenticating user");
+
       Principal principal = request.getUserPrincipal();
       if (principal != null)
       {
@@ -81,8 +81,8 @@
       String authHeader = request.getHeader("Authorization");
       if (authHeader == null)
       {
-         if (log.isDebugEnabled())
-            log.debug("No Authorization Header, sending 401");
+
+         log.debug("No Authorization Header, sending 401");
          response.setHeader("WWW-Authenticate", negotiateScheme);
          response.sendError(401);
 
@@ -103,8 +103,8 @@
       NegotiationContext negotiationContext = (NegotiationContext) session.getNote(NEGOTIATION_CONTEXT);
       if (negotiationContext == null)
       {
-         if (log.isDebugEnabled())
-            log.debug("Creating new NegotiationContext");
+
+         log.debug("Creating new NegotiationContext");
          negotiationContext = new NegotiationContext();
          session.setNote(NEGOTIATION_CONTEXT, negotiationContext);
       }

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java	2010-10-28 12:30:28 UTC (rev 108962)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java	2010-10-28 13:52:33 UTC (rev 108963)
@@ -128,8 +128,7 @@
             }
             else
             {
-               if (log.isTraceEnabled())
-                  log.trace("primaryGroupIdAttribute or objectSidAttribute was null, skipping primary group search.");
+               log.trace("primaryGroupIdAttribute or objectSidAttribute was null, skipping primary group search.");
             }
 
             super.rolesSearch(searchContext, dn);

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java	2010-10-28 12:30:28 UTC (rev 108962)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java	2010-10-28 13:52:33 UTC (rev 108963)
@@ -108,8 +108,7 @@
    {
       if (super.login() == true)
       {
-         if (log.isDebugEnabled())
-            log.debug("super.login()==true");
+         log.debug("super.login()==true");
          return true;
       }
 
@@ -300,8 +299,7 @@
             GSSContext gssContext = (GSSContext) schemeContext;
             if (gssContext == null)
             {
-               if (log.isDebugEnabled())
-                  log.debug("Creating new GSSContext.");
+               log.debug("Creating new GSSContext.");
                GSSManager manager = GSSManager.getInstance();
                gssContext = manager.createContext((GSSCredential) null);
 

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/SecurityDomainTestServlet.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/SecurityDomainTestServlet.java	2010-10-28 12:30:28 UTC (rev 108962)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/src/main/java/org/jboss/security/negotiation/toolkit/SecurityDomainTestServlet.java	2010-10-28 13:52:33 UTC (rev 108963)
@@ -103,8 +103,7 @@
       try
       {
          LoginContext context = new LoginContext(securityDomain);
-         if (log.isDebugEnabled())
-            log.debug("Obtained LoginContext for '" + securityDomain + "' security-domain.");
+         log.debug("Obtained LoginContext for '" + securityDomain + "' security-domain.");
 
          context.login();
          writer.println("<h4>Authenticated</h4>");         
@@ -125,8 +124,7 @@
          writer.println("</code>");
          
          context.logout();
-         if (log.isDebugEnabled())
-            log.debug("logged out.");
+         log.debug("logged out.");
       }
       catch (Exception e)
       {