Author: sebb
Date: Mon Oct 24 16:39:42 2011
New Revision: 1188215
URL: http://svn.apache.org/viewvc?rev=1188215&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Mon Oct 24 16:39:42 2011
@@ -21,7 +21,6 @@ package org.apache.jmeter.protocol.http.
import java.io.Serializable;
import java.net.MalformedURLException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
@@ -154,9 +153,7 @@ public class AnchorModifier extends Abst
for (int x = 0; x < rootList.getLength(); x++) {
urls.addAll(HtmlParsingUtils.createURLFromForm(rootList.item(x),
result.getURL()));
}
- Iterator<HTTPSamplerBase> iter = urls.iterator();
- while (iter.hasNext()) {
- HTTPSamplerBase newUrl = iter.next();
+ for (HTTPSamplerBase newUrl : urls) {
newUrl.setMethod(HTTPConstants.POST);
if (log.isDebugEnabled()) {
log.debug("Potential Form match: " + newUrl.toString());
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Mon Oct 24 16:39:42 2011
@@ -27,7 +27,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -232,9 +231,7 @@ public class HttpRequestHdr {
private HeaderManager createHeaderManager() {
HeaderManager manager = new HeaderManager();
- Iterator<String> keys = headers.keySet().iterator();
- while (keys.hasNext()) {
- String key = keys.next();
+ for (String key : headers.keySet()) {
if (!key.equals(PROXY_CONNECTION)
&& !key.equals(CONTENT_LENGTH)
&& !key.equalsIgnoreCase(HTTPConstants.HEADER_CONNECTION)) {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Mon Oct 24 16:39:42 2011
@@ -635,9 +635,7 @@ public class ProxyControl extends Generi
private JMeterTreeNode findFirstNodeOfType(Class<?> type) {
JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
List<JMeterTreeNode> nodes = treeModel.getNodesOfType(type);
- Iterator<JMeterTreeNode> iter = nodes.iterator();
- while (iter.hasNext()) {
- JMeterTreeNode node = iter.next();
+ for (JMeterTreeNode node : nodes) {
if (node.isEnabled()) {
return node;
}
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Mon Oct 24 16:39:42 2011
@@ -21,7 +21,6 @@ import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -75,9 +74,7 @@ public class DataSourceElement extends A
excaliburSource = null;
}
if (perThreadPoolSet != null) {// in case
- Iterator<ResourceLimitingJdbcDataSource> it =
perThreadPoolSet.iterator();
- while(it.hasNext()){
- ResourceLimitingJdbcDataSource dsc = it.next();
+ for(ResourceLimitingJdbcDataSource dsc : perThreadPoolSet){
log.debug("Disposing pool: "+dsc.getInstrumentableName()+"
@"+System.identityHashCode(dsc));
dsc.dispose();
}
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Mon Oct 24 16:39:42 2011
@@ -31,7 +31,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -134,10 +133,8 @@ public class JDBCSampler extends Abstrac
@Override
protected boolean removeEldestEntry(Map.Entry<Connection, Map<String,
PreparedStatement>> arg0) {
if (size() > MAX_ENTRIES) {
- final Object value = arg0.getValue();
- if (value instanceof Map<?,?>) {
- closeAllStatements(((Map<?,?>)value).values());
- }
+ final Map<String, PreparedStatement> value = arg0.getValue();
+ closeAllStatements(value.values());
return true;
}
return false;
@@ -397,10 +394,8 @@ public class JDBCSampler extends Abstrac
return pstmt;
}
- private static void closeAllStatements(Collection<?> collection) {
- Iterator<?> iterator = collection.iterator();
- while (iterator.hasNext()) {
- PreparedStatement pstmt = (PreparedStatement) iterator.next();
+ private static void closeAllStatements(Collection<PreparedStatement>
collection) {
+ for (PreparedStatement pstmt : collection) {
close(pstmt);
}
}
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Mon Oct 24 16:39:42 2011
@@ -21,7 +21,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -60,9 +59,7 @@ public class ClientPool {
* bugs.
*/
public static synchronized void clearClient() {
- Iterator<Closeable> itr = clients.iterator();
- while (itr.hasNext()) {
- Closeable client = itr.next();
+ for (Closeable client : clients) {
try {
client.close();
} catch (IOException e) {
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1188215&r1=1188214&r2=1188215&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Mon Oct 24 16:39:42 2011
@@ -21,7 +21,6 @@ package org.apache.jmeter.protocol.jms.s
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Map;
import javax.jms.DeliveryMode;
@@ -183,9 +182,7 @@ public class JMSSampler extends Abstract
private void addJMSProperties(TextMessage msg) throws JMSException {
Map<String, String> map =
getArguments(JMSSampler.JMS_PROPERTIES).getArgumentsAsMap();
- Iterator<Map.Entry<String, String>> argIt = map.entrySet().iterator();
- while (argIt.hasNext()) {
- Map.Entry<String, String> me = argIt.next();
+ for (Map.Entry<String, String> me : map.entrySet()) {
String name = me.getKey();
String value = me.getValue();
if (LOGGER.isDebugEnabled()) {
@@ -415,9 +412,7 @@ public class JMSSampler extends Abstract
LOGGER.debug("Number of JNDI properties: " + map.size());
}
}
- Iterator<Map.Entry<String, String>> it = map.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry<String, String> me = it.next();
+ for (Map.Entry<String, String> me : map.entrySet()) {
table.put(me.getKey(), me.getValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
