Author: markt
Date: Fri May 1 16:21:58 2009
New Revision: 770739
URL: http://svn.apache.org/viewvc?rev=770739&view=rev
Log:
Tab police
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=770739&r1=770738&r2=770739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri May 1
16:21:58 2009
@@ -481,14 +481,14 @@
// 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 @@
// 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 @@
// 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 @@
// If patterns is null, continue to avoid an NPE
// See Bugzilla 30624
if ( patterns == null) {
- continue;
+ continue;
}
boolean matched = false;
@@ -591,14 +591,14 @@
// 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 @@
// 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 @@
// 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 @@
// If patterns is null, continue to avoid an NPE
// See Bugzilla 30624
if ( patterns == null) {
- continue;
+ continue;
}
boolean matched = false;
@@ -1157,11 +1157,11 @@
}
}
- if (hasMessageDigest()) {
- // Use pre-generated digest
- return getPassword(username);
- }
-
+ if (hasMessageDigest()) {
+ // Use pre-generated digest
+ return getPassword(username);
+ }
+
String digestValue = username + ":" + realmName + ":"
+ getPassword(username);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
