This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 694a769 Loop can be terminated after condition is met 694a769 is described below commit 694a769fd22b89321de2a26103a31c9923c11228 Author: Lars Grefer <lars.gre...@materna.de> AuthorDate: Tue Apr 7 18:29:29 2020 +0200 Loop can be terminated after condition is met --- java/org/apache/catalina/realm/RealmBase.java | 5 +++-- java/org/apache/catalina/startup/Tomcat.java | 2 ++ .../catalina/tribes/tipis/AbstractReplicatedMap.java | 14 ++++++++++---- test/org/apache/coyote/http11/TestHttp11Processor.java | 1 + 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index 7d3464b..3334452 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -756,10 +756,11 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm { } boolean matched = false; - for(int k=0; k < patterns.length && !matched; k++) { + for(int k = 0; k < patterns.length; k++) { String pattern = patterns[k]; - if(pattern.equals("/")){ + if (pattern.equals("/")) { matched = true; + break; } } if(matched) { diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index a6f09f3..16bcbab 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -554,6 +554,7 @@ public class Tomcat { for (Connector serviceConnector : service.findConnectors()) { if (connector == serviceConnector) { found = true; + break; } } if (!found) { @@ -583,6 +584,7 @@ public class Tomcat { for (Container engineHost : engine.findChildren()) { if (engineHost == host) { found = true; + break; } } if (!found) { diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index c6e8c2c..fb2522e 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -824,8 +824,11 @@ public abstract class AbstractReplicatedMap<K,V> public boolean inSet(Member m, Member[] set) { if ( set == null ) return false; boolean result = false; - for (int i=0; i<set.length && (!result); i++ ) - if ( m.equals(set[i]) ) result = true; + for (int i = 0; i < set.length; i++ ) + if (m.equals(set[i])) { + result = true; + break; + } return result; } @@ -833,8 +836,11 @@ public abstract class AbstractReplicatedMap<K,V> List<Member> result = new ArrayList<>(); for (int i=0; i<set.length; i++ ) { boolean include = true; - for (int j=0; j<mbrs.length && include; j++ ) - if ( mbrs[j].equals(set[i]) ) include = false; + for (int j = 0; j < mbrs.length; j++ ) + if (mbrs[j].equals(set[i])) { + include = false; + break; + } if ( include ) result.add(set[i]); } return result.toArray(new Member[0]); diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java index be2fdf4..f85bdcc 100644 --- a/test/org/apache/coyote/http11/TestHttp11Processor.java +++ b/test/org/apache/coyote/http11/TestHttp11Processor.java @@ -618,6 +618,7 @@ public class TestHttp11Processor extends TomcatBaseTest { for (Cookie cookie : req.getCookies()) { if (cookie.getName().equalsIgnoreCase("something.that.should.not.leak")) { bug55772RequestStateLeaked = true; + break; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org