You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2017/05/10 08:38:51 UTC
svn commit: r1794686 - in /tomcat/trunk/java/org/apache/catalina:
ant/jmx/JMXAccessorTask.java ha/session/DeltaManager.java
ha/tcp/ReplicationValve.java ha/tcp/SimpleTcpCluster.java
tribes/transport/nio/NioReceiver.java
Author: ebourg
Date: Wed May 10 08:38:51 2017
New Revision: 1794686
URL: http://svn.apache.org/viewvc?rev=1794686&view=rev
Log:
Use foreach loops instead of for+iterator loops
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1794686&r1=1794685&r2=1794686&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Wed May 10 08:38:51 2017
@@ -23,7 +23,6 @@ import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -617,8 +616,7 @@ public class JMXAccessorTask extends Bas
CompositeDataSupport data = (CompositeDataSupport) result;
CompositeType compositeType = data.getCompositeType();
Set<String> keys = compositeType.keySet();
- for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
- String key = iter.next();
+ for (String key : keys) {
Object value = data.get(key);
OpenType<?> type = compositeType.getType(key);
if (type instanceof SimpleType<?>) {
@@ -629,10 +627,8 @@ public class JMXAccessorTask extends Bas
}
} else if (result instanceof TabularDataSupport) {
TabularDataSupport data = (TabularDataSupport) result;
- for (Iterator<Object> iter = data.keySet().iterator(); iter.hasNext();) {
- Object key = iter.next();
- for (Iterator<?> iter1 = ((List<?>) key).iterator(); iter1.hasNext();) {
- Object key1 = iter1.next();
+ for (Object key : data.keySet()) {
+ for (Object key1 : ((List<?>) key)) {
CompositeData valuedata = data.get(new Object[] { key1 });
Object value = valuedata.get("value");
OpenType<?> type = valuedata.getCompositeType().getType(
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1794686&r1=1794685&r2=1794686&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed May 10 08:38:51 2017
@@ -24,7 +24,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -756,9 +755,7 @@ public class DeltaManager extends Cluste
waitForSendAllSessions(beforeSendTime);
} finally {
synchronized(receivedMessageQueue) {
- for (Iterator<SessionMessage> iter = receivedMessageQueue.iterator();
- iter.hasNext();) {
- SessionMessage smsg = iter.next();
+ for (SessionMessage smsg : receivedMessageQueue) {
if (!stateTimestampDrop) {
messageReceived(smsg,
smsg.getAddress() != null ? (Member) smsg.getAddress() : null);
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=1794686&r1=1794685&r2=1794686&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Wed May 10 08:38:51 2017
@@ -422,8 +422,7 @@ public class ReplicationValve
protected void sendCrossContextSession() {
List<DeltaSession> sessions = crossContextSessions.get();
if(sessions != null && sessions.size() >0) {
- for(Iterator<DeltaSession> iter = sessions.iterator(); iter.hasNext() ;) {
- Session session = iter.next();
+ for (DeltaSession session : sessions) {
if(log.isDebugEnabled()) {
log.debug(sm.getString("ReplicationValve.crossContext.sendDelta",
session.getManager().getContext().getName() ));
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1794686&r1=1794685&r2=1794686&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Wed May 10 08:38:51 2017
@@ -21,7 +21,6 @@ import java.beans.PropertyChangeSupport;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -568,8 +567,8 @@ public class SimpleTcpCluster extends Li
*/
protected void registerClusterValve() {
if(container != null ) {
- for (Iterator<Valve> iter = valves.iterator(); iter.hasNext();) {
- ClusterValve valve = (ClusterValve) iter.next();
+ for (Valve v : valves) {
+ ClusterValve valve = (ClusterValve) v;
if (log.isDebugEnabled())
log.debug("Invoking addValve on " + getContainer()
+ " with class=" + valve.getClass().getName());
@@ -585,8 +584,8 @@ public class SimpleTcpCluster extends Li
* unregister all cluster valve to host or engine
*/
protected void unregisterClusterValve() {
- for (Iterator<Valve> iter = valves.iterator(); iter.hasNext();) {
- ClusterValve valve = (ClusterValve) iter.next();
+ for (Valve v : valves) {
+ ClusterValve valve = (ClusterValve) v;
if (log.isDebugEnabled())
log.debug("Invoking removeValve on " + getContainer()
+ " with class=" + valve.getClass().getName());
@@ -768,9 +767,7 @@ public class SimpleTcpCluster extends Li
//invoke all the listeners
boolean accepted = false;
if (message != null) {
- for (Iterator<ClusterListener> iter = clusterListeners.iterator();
- iter.hasNext();) {
- ClusterListener listener = iter.next();
+ for (ClusterListener listener : clusterListeners) {
if (listener.accept(message)) {
accepted = true;
listener.messageReceived(message);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1794686&r1=1794685&r2=1794686&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Wed May 10 08:38:51 2017
@@ -197,8 +197,7 @@ public class NioReceiver extends Receive
Selector tmpsel = this.selector.get();
Set<SelectionKey> keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null;
if ( keys == null ) return;
- for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext();) {
- SelectionKey key = iter.next();
+ for (SelectionKey key : keys) {
try {
// if (key.interestOps() == SelectionKey.OP_READ) {
// //only timeout sockets that we are waiting for a read from
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org