Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java Mon Jul 2 20:15:08 2018 @@ -181,11 +181,10 @@ public class ServiceRefFactory implement Method m = serviceInterfaceClass.getMethod("setEndpointAddress", new Class[] { java.lang.String.class, java.lang.String.class }); - for (Iterator<String> i = ports.keySet().iterator(); i.hasNext();) { - String portName = i.next(); + for (String portName : ports.keySet()) { Port port = wsdlservice.getPort(portName); String endpoint = getSOAPLocation(port); - m.invoke(service, new Object[] {port.getName(), endpoint }); + m.invoke(service, new Object[]{port.getName(), endpoint}); portComponentRef.put(endpoint, new QName(port.getName())); } } catch (Exception e) { @@ -301,10 +300,10 @@ public class ServiceRefFactory implement handlerInfo.setHandlerConfig(config); if (!portNames.isEmpty()) { - Iterator<String> iter = portNames.iterator(); - while (iter.hasNext()) - initHandlerChain(new QName(iter.next()), handlerRegistry, + for (String portName : portNames) { + initHandlerChain(new QName(portName), handlerRegistry, handlerInfo, soaproles); + } } else { Enumeration<QName> e = portComponentRef.elements(); while(e.hasMoreElements()) @@ -330,9 +329,7 @@ public class ServiceRefFactory implement String endpoint = null; @SuppressWarnings("unchecked") List<ExtensibilityElement> extensions = port.getExtensibilityElements(); - for (Iterator<ExtensibilityElement> i = extensions.iterator(); - i.hasNext();) { - ExtensibilityElement ext = i.next(); + for (ExtensibilityElement ext : extensions) { if (ext instanceof SOAPAddress) { SOAPAddress addr = (SOAPAddress) ext; endpoint = addr.getLocationURI();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java Mon Jul 2 20:15:08 2018 @@ -25,7 +25,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -97,9 +96,7 @@ public class Txt2Html int count = 0; // Step through each file and convert. - Iterator<FileSet> iter = filesets.iterator(); - while( iter.hasNext() ) { - FileSet fs = iter.next(); + for (FileSet fs : filesets) { DirectoryScanner ds = fs.getDirectoryScanner(getProject()); File basedir = ds.getBasedir(); String[] files = ds.getIncludedFiles(); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java Mon Jul 2 20:15:08 2018 @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -558,9 +557,7 @@ public class SecurityConstraint extends // Add the per method constraints Collection<HttpMethodConstraintElement> methods = element.getHttpMethodConstraints(); - Iterator<HttpMethodConstraintElement> methodIter = methods.iterator(); - while (methodIter.hasNext()) { - HttpMethodConstraintElement methodElement = methodIter.next(); + for (HttpMethodConstraintElement methodElement : methods) { SecurityConstraint constraint = createConstraint(methodElement, urlPattern, true); // There will always be a single collection @@ -574,9 +571,8 @@ public class SecurityConstraint extends if (constraint != null) { // There will always be a single collection SecurityCollection collection = constraint.findCollections()[0]; - Iterator<String> ommittedMethod = element.getMethodNames().iterator(); - while (ommittedMethod.hasNext()) { - collection.addOmittedMethod(ommittedMethod.next()); + for (String name : element.getMethodNames()) { + collection.addOmittedMethod(name); } result.add(constraint); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Jul 2 20:15:08 2018 @@ -27,7 +27,6 @@ import java.net.URISyntaxException; import java.security.Permission; import java.util.EmptyStackException; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -921,9 +920,7 @@ public class Digester extends DefaultHan } // Fire "finish" events for all defined rules - Iterator<Rule> rules = getRules().rules().iterator(); - while (rules.hasNext()) { - Rule rule = rules.next(); + for (Rule rule : getRules().rules()) { try { rule.finish(); } catch (Exception e) { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java Mon Jul 2 20:15:08 2018 @@ -21,7 +21,6 @@ package org.apache.tomcat.util.digester; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; @@ -104,9 +103,7 @@ public class RulesBase implements Rules public void setDigester(Digester digester) { this.digester = digester; - Iterator<Rule> items = rules.iterator(); - while (items.hasNext()) { - Rule item = items.next(); + for (Rule item : rules) { item.setDigester(digester); } @@ -207,9 +204,7 @@ public class RulesBase implements Rules if ((rulesList == null) || (rulesList.size() < 1)) { // Find the longest key, ie more discriminant String longKey = ""; - Iterator<String> keys = this.cache.keySet().iterator(); - while (keys.hasNext()) { - String key = keys.next(); + for (String key : this.cache.keySet()) { if (key.startsWith("*/")) { if (pattern.equals(key.substring(2)) || pattern.endsWith(key.substring(1))) { @@ -271,9 +266,7 @@ public class RulesBase implements Rules // Select only Rules that match on the specified namespace URI ArrayList<Rule> results = new ArrayList<>(); - Iterator<Rule> items = list.iterator(); - while (items.hasNext()) { - Rule item = items.next(); + for (Rule item : list) { if ((namespaceURI.equals(item.getNamespaceURI())) || (item.getNamespaceURI() == null)) { results.add(item); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java Mon Jul 2 20:15:08 2018 @@ -82,10 +82,7 @@ public class BaseNotificationBroadcaster // Optimization to coalesce attribute name filters if (filter instanceof BaseAttributeFilter) { BaseAttributeFilter newFilter = (BaseAttributeFilter) filter; - Iterator<BaseNotificationBroadcasterEntry> items = - entries.iterator(); - while (items.hasNext()) { - BaseNotificationBroadcasterEntry item = items.next(); + for (BaseNotificationBroadcasterEntry item : entries) { if ((item.listener == listener) && (item.filter != null) && (item.filter instanceof BaseAttributeFilter) && @@ -161,10 +158,7 @@ public class BaseNotificationBroadcaster public void sendNotification(Notification notification) { synchronized (entries) { - Iterator<BaseNotificationBroadcasterEntry> items = - entries.iterator(); - while (items.hasNext()) { - BaseNotificationBroadcasterEntry item = items.next(); + for (BaseNotificationBroadcasterEntry item : entries) { if ((item.filter != null) && (!item.filter.isNotificationEnabled(notification))) continue; Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Jul 2 20:15:08 2018 @@ -26,7 +26,6 @@ import java.lang.management.ManagementFa import java.net.URL; import java.util.HashMap; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import javax.management.DynamicMBean; @@ -258,9 +257,7 @@ public class Registry implements Registr if( mbeans==null ) { return; } - Iterator<ObjectName> itr = mbeans.iterator(); - while(itr.hasNext()) { - ObjectName current = itr.next(); + for (ObjectName current : mbeans) { try { if(current == null) { continue; Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java Mon Jul 2 20:15:08 2018 @@ -21,7 +21,6 @@ package org.apache.tomcat.util.modeler.m import java.io.InputStream; import java.net.URL; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.management.ObjectName; @@ -176,9 +175,8 @@ public class MbeansDescriptorsDigesterSo } } - Iterator<ManagedBean> iter = loadedMbeans.iterator(); - while (iter.hasNext()) { - registry.addManagedBean(iter.next()); + for (ManagedBean loadedMbean : loadedMbeans) { + registry.addManagedBean(loadedMbean); } } } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon Jul 2 20:15:08 2018 @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.nio.channels.NetworkChannel; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -226,9 +225,7 @@ public abstract class AbstractJsseEndpoi candidateCiphers.retainAll(serverCiphers); } - Iterator<Cipher> candidateIter = candidateCiphers.iterator(); - while (candidateIter.hasNext()) { - Cipher candidate = candidateIter.next(); + for (Cipher candidate : candidateCiphers) { for (SSLHostConfigCertificate certificate : certificates) { if (certificate.getType().isCompatibleWith(candidate.getAu())) { return certificate; Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java Mon Jul 2 20:15:08 2018 @@ -17,7 +17,6 @@ package org.apache.tomcat.websocket.server; import java.util.Comparator; -import java.util.Iterator; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.AtomicInteger; @@ -48,9 +47,7 @@ public class WsWriteTimeout implements B backgroundProcessCount = 0; long now = System.currentTimeMillis(); - Iterator<WsRemoteEndpointImplServer> iter = endpoints.iterator(); - while (iter.hasNext()) { - WsRemoteEndpointImplServer endpoint = iter.next(); + for (WsRemoteEndpointImplServer endpoint : endpoints) { if (endpoint.getTimeoutExpiry() < now) { // Background thread, not the thread that triggered the // write so no need to use a dispatch Modified: tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1834881&r1=1834880&r2=1834881&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original) +++ tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Mon Jul 2 20:15:08 2018 @@ -17,7 +17,6 @@ --%> <%@page session="false" contentType="text/html; charset=ISO-8859-1" %> <%@page import="java.util.Collection" %> -<%@page import="java.util.Iterator" %> <%@page import="org.apache.catalina.manager.JspHelper" %> <%@page import="org.apache.catalina.Session" %> <%@page import="org.apache.catalina.ha.session.DeltaSession" %> @@ -34,7 +33,7 @@ String submitUrl = JspHelper.escapeXml(response.encodeURL( ((HttpServletRequest) pageContext.getRequest()).getRequestURI() + "?path=" + path + "&version=" + version)); - Collection activeSessions = (Collection) request.getAttribute("activeSessions"); + Collection<Session> activeSessions = (Collection<Session>) request.getAttribute("activeSessions"); %> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/> @@ -101,9 +100,8 @@ </tfoot> <% } // end if %> <tbody> -<% Iterator iter = activeSessions.iterator(); - while (iter.hasNext()) { - Session currentSession = (Session) iter.next(); +<% + for (Session currentSession : activeSessions) { String currentSessionId = JspHelper.escapeXml(currentSession.getId()); String type; if (currentSession instanceof DeltaSession) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
