Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 94086 invoked from network); 23 Apr 2010 15:04:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Apr 2010 15:04:16 -0000 Received: (qmail 73302 invoked by uid 500); 23 Apr 2010 15:04:15 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 73239 invoked by uid 500); 23 Apr 2010 15:04:15 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 73230 invoked by uid 99); 23 Apr 2010 15:04:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Apr 2010 15:04:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Apr 2010 15:04:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 21A6C23889B6; Fri, 23 Apr 2010 15:03:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r937322 - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ ha/authenticator/ ha/session/ startup/ Date: Fri, 23 Apr 2010 15:03:28 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100423150329.21A6C23889B6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Apr 23 15:03:28 2010 New Revision: 937322 URL: http://svn.apache.org/viewvc?rev=937322&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49140 Use appropriate iterators and for-each where possible Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 23 15:03:28 2010 @@ -2962,13 +2962,8 @@ public class Request // Process the quality values in highest->lowest order (due to // negating the Double value when creating the key) - Iterator keys = locales.keySet().iterator(); - while (keys.hasNext()) { - Double key = keys.next(); - ArrayList list = locales.get(key); - Iterator values = list.iterator(); - while (values.hasNext()) { - Locale locale = values.next(); + for (ArrayList list : locales.values()) { + for (Locale locale : list) { addLocale(locale); } } Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Fri Apr 23 15:03:28 2010 @@ -649,11 +649,11 @@ class ApplicationHttpRequest extends Htt if (orig == null) return (new HashMap()); HashMap dest = new HashMap(); - Iterator keys = orig.keySet().iterator(); - while (keys.hasNext()) { - String key = keys.next(); - dest.put(key, orig.get(key)); + + for (Map.Entry entry : orig.entrySet()) { + dest.put(entry.getKey(), entry.getValue()); } + return (dest); } Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Apr 23 15:03:28 2010 @@ -38,7 +38,6 @@ import java.util.TreeMap; import javax.management.AttributeNotFoundException; import javax.management.ListenerNotFoundException; import javax.management.MBeanNotificationInfo; -import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.Notification; @@ -4461,13 +4460,8 @@ public class StandardContext } // Load the collected "load on startup" servlets - Iterator keys = map.keySet().iterator(); - while (keys.hasNext()) { - Integer key = keys.next(); - ArrayList list = map.get(key); - Iterator wrappers = list.iterator(); - while (wrappers.hasNext()) { - Wrapper wrapper = wrappers.next(); + for (ArrayList list : map.values()) { + for (Wrapper wrapper : list) { try { wrapper.load(); } catch (ServletException e) { Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java Fri Apr 23 15:03:28 2010 @@ -144,13 +144,10 @@ public class ClusterSingleSignOnListener Session session = null; if (ctxname == null) { - java.util.Iterator i = managers.keySet().iterator(); - while (i.hasNext()) { - String key = i.next(); - ClusterManager mgr = managers.get(key); - if (mgr != null) { + for (Map.Entry entry : managers.entrySet()) { + if (entry.getValue() != null) { try { - session = mgr.findSession(sessionId); + session = entry.getValue().findSession(sessionId); } catch (IOException io) { log.error("Session doesn't exist:" + io); } @@ -160,7 +157,7 @@ public class ClusterSingleSignOnListener // up if (log.isDebugEnabled()) log.debug("Context manager doesn't exist:" - + key); + + entry.getKey()); } } } else { Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Fri Apr 23 15:03:28 2010 @@ -17,7 +17,6 @@ package org.apache.catalina.ha.session; -import java.util.Iterator; import java.util.Map; import org.apache.catalina.ha.*; @@ -67,18 +66,16 @@ public class ClusterSessionListener exte //if so, wait until we are fully started up Map managers = cluster.getManagers() ; if (ctxname == null) { - Iterator i = managers.keySet().iterator(); - while (i.hasNext()) { - String key = i.next(); - ClusterManager mgr = managers.get(key); - if (mgr != null) - mgr.messageDataReceived(msg); + for (Map.Entry entry : + managers.entrySet()) { + if (entry.getValue() != null) + entry.getValue().messageDataReceived(msg); else { //this happens a lot before the system has started // up if (log.isDebugEnabled()) log.debug("Context manager doesn't exist:" - + key); + + entry.getKey()); } } } else { Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=937322&r1=937321&r2=937322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Apr 23 15:03:28 2010 @@ -1926,9 +1926,9 @@ public class ContextConfig } else if ("initParams".equals(name)) { Map initParams = processAnnotationWebInitParams(evp.getValue()); - for (String paramName : initParams.keySet()) { - servletDef.addInitParameter(paramName, - initParams.get(paramName)); + for (Map.Entry entry : initParams.entrySet()) { + servletDef.addInitParameter(entry.getKey(), + entry.getValue()); } } else { // Ignore @@ -1996,9 +1996,9 @@ public class ContextConfig } else if ("initParams".equals(name)) { Map initParams = processAnnotationWebInitParams(evp.getValue()); - for (String paramName : initParams.keySet()) { - filterDef.addInitParameter(paramName, - initParams.get(paramName)); + for (Map.Entry entry : initParams.entrySet()) { + filterDef.addInitParameter(entry.getKey(), + entry.getValue()); } } else { // Ignore --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org