From 294fb6d73a4225086ed5094ba70543c2b8fef3bb Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 1 May 2009 16:21:58 +0000 Subject: [PATCH] Tab police git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@770739 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/realm/RealmBase.java | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index 775fd7a42..78797b422 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -481,14 +481,14 @@ public abstract class RealmBase // If collection is null, continue to avoid an NPE // See Bugzilla 30624 if ( collection == null) { - continue; + continue; } if (log.isDebugEnabled()) { log.debug(" Checking constraint '" + constraints[i] + "' against " + method + " " + uri + " --> " + constraints[i].included(uri, method)); - } + } for(int j=0; j < collection.length; j++){ String [] patterns = collection[j].findPatterns(); @@ -496,7 +496,7 @@ public abstract class RealmBase // If patterns is null, continue to avoid an NPE // See Bugzilla 30624 if ( patterns == null) { - continue; + continue; } for(int k=0; k < patterns.length; k++) { @@ -525,14 +525,14 @@ public abstract class RealmBase // If collection is null, continue to avoid an NPE // See Bugzilla 30624 if ( collection == null) { - continue; + continue; } if (log.isDebugEnabled()) { log.debug(" Checking constraint '" + constraints[i] + "' against " + method + " " + uri + " --> " + constraints[i].included(uri, method)); - } + } for(int j=0; j < collection.length; j++){ String [] patterns = collection[j].findPatterns(); @@ -540,7 +540,7 @@ public abstract class RealmBase // If patterns is null, continue to avoid an NPE // See Bugzilla 30624 if ( patterns == null) { - continue; + continue; } boolean matched = false; @@ -591,14 +591,14 @@ public abstract class RealmBase // If collection is null, continue to avoid an NPE // See Bugzilla 30624 if ( collection == null) { - continue; + continue; } if (log.isDebugEnabled()) { log.debug(" Checking constraint '" + constraints[i] + "' against " + method + " " + uri + " --> " + constraints[i].included(uri, method)); - } + } boolean matched = false; int pos = -1; @@ -608,7 +608,7 @@ public abstract class RealmBase // If patterns is null, continue to avoid an NPE // See Bugzilla 30624 if ( patterns == null) { - continue; + continue; } for(int k=0; k < patterns.length && !matched; k++) { @@ -648,14 +648,14 @@ public abstract class RealmBase // If collection is null, continue to avoid an NPE // See Bugzilla 30624 if ( collection == null) { - continue; + continue; } if (log.isDebugEnabled()) { log.debug(" Checking constraint '" + constraints[i] + "' against " + method + " " + uri + " --> " + constraints[i].included(uri, method)); - } + } for(int j=0; j < collection.length; j++){ String [] patterns = collection[j].findPatterns(); @@ -663,7 +663,7 @@ public abstract class RealmBase // If patterns is null, continue to avoid an NPE // See Bugzilla 30624 if ( patterns == null) { - continue; + continue; } boolean matched = false; @@ -1157,11 +1157,11 @@ public abstract class RealmBase } } - if (hasMessageDigest()) { - // Use pre-generated digest - return getPassword(username); - } - + if (hasMessageDigest()) { + // Use pre-generated digest + return getPassword(username); + } + String digestValue = username + ":" + realmName + ":" + getPassword(username); -- 2.11.0