[jboss-cvs] JBossAS SVN: r108981 - in projects/security/security-negotiation/trunk: jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 29 05:12:10 EDT 2010
Author: darran.lofthouse at jboss.com
Date: 2010-10-29 05:12:09 -0400 (Fri, 29 Oct 2010)
New Revision: 108981
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-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/AdvancedLdapLoginModule.java
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
Log:
Reduce the log.isDebugEnabled() and log.isTraceEnabled() calls to a maximum of once per method each.
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-29 08:57:56 UTC (rev 108980)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2010-10-29 09:12:09 UTC (rev 108981)
@@ -64,6 +64,7 @@
throws IOException
{
+ boolean DEBUG = log.isDebugEnabled();
log.trace("Authenticating user");
Principal principal = request.getUserPrincipal();
@@ -76,7 +77,7 @@
String negotiateScheme = getNegotiateScheme();
- if (log.isDebugEnabled())
+ if (DEBUG)
log.debug("Header - " + request.getHeader("Authorization"));
String authHeader = request.getHeader("Authorization");
if (authHeader == null)
@@ -130,7 +131,7 @@
authenticationMethod = negotiationContext.getAuthenticationMethod();
- if (log.isDebugEnabled() && principal != null)
+ if (DEBUG && principal != null)
log.debug("authenticated principal = " + principal);
NegotiationMessage responseMessage = negotiationContext.getResponseMessage();
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-29 08:57:56 UTC (rev 108980)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedADLoginModule.java 2010-10-29 09:12:09 UTC (rev 108981)
@@ -67,6 +67,7 @@
@Override
protected void rolesSearch(LdapContext searchContext, String dn) throws LoginException
{
+ boolean TRACE = log.isTraceEnabled();
if (skipPrimaryGroupSearch == false)
{
skipPrimaryGroupSearch = true;
@@ -96,7 +97,7 @@
byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
byteBuffer.putInt(primaryGroupId);
- if (log.isTraceEnabled())
+ if (TRACE)
{
String objectSidBase64 = Base64.encodeBytes(objectSid);
String searchObjectSidBase64 = Base64.encodeBytes(searchObjectSid);
@@ -116,7 +117,7 @@
String baseResultDN = canonicalize(searchResult.getName());
String resultDN = "\"" + baseResultDN + "\"";
- if (log.isTraceEnabled())
+ if (TRACE)
{
log.trace("Search found primary group " + resultDN);
}
@@ -135,7 +136,7 @@
}
catch (NamingException e)
{
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("Failed to load primary group", e);
}
finally
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java 2010-10-29 08:57:56 UTC (rev 108980)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java 2010-10-29 09:12:09 UTC (rev 108981)
@@ -664,7 +664,8 @@
{
String[] returnAttribute =
{roleNameAttributeID};
- if (log.isTraceEnabled())
+ boolean TRACE = log.isTraceEnabled();
+ if (TRACE)
log.trace("Using roleDN: " + roleDN);
try
{
@@ -681,25 +682,26 @@
}
catch (NamingException e)
{
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("Failed to query roleNameAttrName", e);
}
}
protected void recurseRolesSearch(LdapContext searchContext, String roleDN) throws LoginException
{
+ boolean TRACE = log.isTraceEnabled();
if (recurseRoles)
{
if (processedRoleDNs.contains(roleDN) == false)
{
processedRoleDNs.add(roleDN);
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("Recursive search for '" + roleDN + "'");
rolesSearch(searchContext, roleDN);
}
else
{
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("Already visited role '" + roleDN + "' ending recursion.");
}
}
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-29 08:57:56 UTC (rev 108980)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2010-10-29 09:12:09 UTC (rev 108981)
@@ -106,6 +106,7 @@
@Override
public boolean login() throws LoginException
{
+ boolean TRACE = log.isTraceEnabled();
if (super.login() == true)
{
log.debug("super.login()==true");
@@ -129,7 +130,7 @@
AcceptSecContext action = new AcceptSecContext(negotiationContext);
Object result = Subject.doAs(server, action);
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("Result - " + result);
if (result instanceof Boolean)
@@ -165,7 +166,7 @@
}
}
- if (log.isTraceEnabled())
+ if (TRACE)
log.trace("super.loginOk " + super.loginOk);
if (super.loginOk == true)
{
@@ -239,6 +240,7 @@
public Object run()
{
+ boolean DEBUG = log.isDebugEnabled();
try
{
// The message type will have already been checked before this point so we know it is
@@ -313,7 +315,7 @@
// TODO - Refactor to only do this once.
identity = new KerberosPrincipal(gssContext.getSrcName().toString());
- if (log.isDebugEnabled())
+ if (DEBUG)
{
log.debug("context.getCredDelegState() = " + gssContext.getCredDelegState());
log.debug("context.getMutualAuthState() = " + gssContext.getMutualAuthState());
@@ -344,7 +346,7 @@
{
identity = createIdentity(gssContext.getSrcName().toString());
- if (log.isDebugEnabled())
+ if (DEBUG)
{
log.debug("context.getCredDelegState() = " + gssContext.getCredDelegState());
log.debug("context.getMutualAuthState() = " + gssContext.getMutualAuthState());
More information about the jboss-cvs-commits
mailing list