You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/02/25 18:25:56 UTC
svn commit: r1571756 - in /commons/proper/dbcp/trunk/src:
main/java/org/apache/commons/dbcp2/
main/java/org/apache/commons/dbcp2/cpdsadapter/
test/java/org/apache/commons/dbcp2/
test/java/org/apache/commons/dbcp2/cpdsadapter/ test/java/org/apache/commo...
Author: ggregory
Date: Tue Feb 25 17:25:56 2014
New Revision: 1571756
URL: http://svn.apache.org/r1571756
Log:
Convert 'for' loops to enhanced 'for' loops.
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java Tue Feb 25 17:25:56 2014
@@ -24,7 +24,6 @@ import java.util.Properties;
import java.util.Collection;
import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Collections;
import java.util.logging.Logger;
import java.security.AccessController;
@@ -1234,9 +1233,7 @@ public class BasicDataSource
public void setConnectionInitSqls(Collection<String> connectionInitSqls) {
if ((connectionInitSqls != null) && (connectionInitSqls.size() > 0)) {
ArrayList<String> newVal = null;
- for (Iterator<String> iterator = connectionInitSqls.iterator();
- iterator.hasNext();) {
- String s = iterator.next();
+ for (String s : connectionInitSqls) {
if (s != null && s.trim().length() > 0) {
if (newVal == null) {
newVal = new ArrayList<>();
@@ -1813,8 +1810,7 @@ public class BasicDataSource
String[] entries = connectionProperties.split(";");
Properties properties = new Properties();
- for (int i = 0; i < entries.length; i++) {
- String entry = entries[i];
+ for (String entry : entries) {
if (entry.length() > 0) {
int index = entry.indexOf('=');
if (index > 0) {
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java Tue Feb 25 17:25:56 2014
@@ -172,8 +172,7 @@ public class BasicDataSourceFactory impl
}
Properties properties = new Properties();
- for (int i = 0 ; i < ALL_PROPERTIES.length ; i++) {
- String propertyName = ALL_PROPERTIES[i];
+ for (String propertyName : ALL_PROPERTIES) {
RefAddr ra = ref.get(propertyName);
if (ra != null) {
String propertyValue = ra.getContent().toString();
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java Tue Feb 25 17:25:56 2014
@@ -142,8 +142,8 @@ public class DelegatingStatement extends
List<AbandonedTrace> resultSets = getTrace();
if( resultSets != null) {
ResultSet[] set = resultSets.toArray(new ResultSet[resultSets.size()]);
- for (int i = 0; i < set.length; i++) {
- set[i].close();
+ for (ResultSet element : set) {
+ element.close();
}
clearTrace();
}
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Tue Feb 25 17:25:56 2014
@@ -119,8 +119,8 @@ public class PoolableCallableStatement e
List<AbandonedTrace> resultSets = getTrace();
if(resultSets != null) {
ResultSet[] set = resultSets.toArray(new ResultSet[resultSets.size()]);
- for(int i = 0; i < set.length; i++) {
- set[i].close();
+ for (ResultSet element : set) {
+ element.close();
}
clearTrace();
}
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java Tue Feb 25 17:25:56 2014
@@ -138,8 +138,8 @@ public class PoolablePreparedStatement<K
List<AbandonedTrace> resultSets = getTrace();
if( resultSets != null) {
ResultSet[] set = resultSets.toArray(new ResultSet[resultSets.size()]);
- for (int i = 0; i < set.length; i++) {
- set[i].close();
+ for (ResultSet element : set) {
+ element.close();
}
clearTrace();
}
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Tue Feb 25 17:25:56 2014
@@ -232,8 +232,8 @@ class PooledConnectionImpl implements Po
void notifyListeners() {
ConnectionEvent event = new ConnectionEvent(this);
Object[] listeners = eventListeners.toArray();
- for (int i = 0; i < listeners.length; i++) {
- ((ConnectionEventListener) listeners[i]).connectionClosed(event);
+ for (Object listener : listeners) {
+ ((ConnectionEventListener) listener).connectionClosed(event);
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java Tue Feb 25 17:25:56 2014
@@ -345,9 +345,9 @@ public class TestBasicDataSource extends
assertEquals(CATALOG, c[i].getCatalog());
}
- for (int i = 0; i < c.length; i++) {
- c[i].setCatalog("error");
- c[i].close();
+ for (Connection element : c) {
+ element.setCatalog("error");
+ element.close();
}
for (int i = 0; i < c.length; i++) {
@@ -356,8 +356,8 @@ public class TestBasicDataSource extends
assertEquals(CATALOG, c[i].getCatalog());
}
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java Tue Feb 25 17:25:56 2014
@@ -106,25 +106,25 @@ public abstract class TestConnectionPool
c[i].prepareCall("warning");
}
- for (int i = 0; i < c.length; i++) {
- assertNotNull(c[i].getWarnings());
+ for (Connection element : c) {
+ assertNotNull(element.getWarnings());
}
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
for (int i = 0; i < c.length; i++) {
c[i] = newConnection();
}
- for (int i = 0; i < c.length; i++) {
+ for (Connection element : c) {
// warnings should have been cleared by putting the connection back in the pool
- assertNull(c[i].getWarnings());
+ assertNull(element.getWarnings());
}
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -408,8 +408,8 @@ public abstract class TestConnectionPool
}
// Close connections one at a time and get new ones, making sure
// the new ones come from the pool
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
Connection con = newConnection();
Connection underCon =
((DelegatingConnection<?>) con).getInnermostDelegate();
@@ -461,8 +461,8 @@ public abstract class TestConnectionPool
assertTrue(!conn[j].equals(conn[i]));
}
}
- for(int i=0;i<conn.length;i++) {
- conn[i].close();
+ for (Connection element : conn) {
+ element.close();
}
}
@@ -478,8 +478,8 @@ public abstract class TestConnectionPool
}
}
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -497,8 +497,8 @@ public abstract class TestConnectionPool
// get a new connection
c[0] = newConnection();
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -517,8 +517,8 @@ public abstract class TestConnectionPool
// throw an exception
}
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -721,8 +721,8 @@ public abstract class TestConnectionPool
ThreadGroup threadGroup = new ThreadGroup("foo") {
@Override
public void uncaughtException(Thread t, Throwable e) {
- for (int i = 0; i < pts.length; i++) {
- pts[i].stop();
+ for (PoolTest pt : pts) {
+ pt.stop();
}
}
};
@@ -731,16 +731,16 @@ public abstract class TestConnectionPool
pts[i] = new PoolTest(threadGroup, holdTime, expectError, loopOnce);
}
// Start all the threads
- for (int i = 0; i < pts.length; i++) {
- pts[i].start();
+ for (PoolTest pt : pts) {
+ pt.start();
}
// Give all threads a chance to start and succeed
Thread.sleep(300L);
// Stop threads
- for (int i = 0; i < pts.length; i++) {
- pts[i].stop();
+ for (PoolTest pt : pts) {
+ pt.stop();
}
/*
@@ -752,8 +752,7 @@ public abstract class TestConnectionPool
int failed=0;
int didNotRun = 0;
int loops=0;
- for (int i = 0; i < pts.length; i++) {
- final PoolTest poolTest = pts[i];
+ for (final PoolTest poolTest : pts) {
poolTest.thread.join();
loops += poolTest.loops;
final String state = poolTest.state;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java Tue Feb 25 17:25:56 2014
@@ -92,8 +92,8 @@ public class TestPoolingDataSource exten
Assert.assertEquals(
((DelegatingConnection<?>) c[0]).getInnermostDelegateInternal(),
((DelegatingConnection<?>) con).getInnermostDelegateInternal());
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java Tue Feb 25 17:25:56 2014
@@ -130,16 +130,16 @@ public class TestDriverAdapterCPDS exten
// get a new connection
c[0] = pcds.getPooledConnection("u1", "p1").getConnection();
- for (int i=0; i<c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
// open all the connections
for (int i=0; i<c.length; i++) {
c[i] = pcds.getPooledConnection("u1", "p1").getConnection();
}
- for (int i=0; i<c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java Tue Feb 25 17:25:56 2014
@@ -19,7 +19,6 @@ package org.apache.commons.dbcp2.datasou
import java.sql.Connection;
import java.sql.SQLException;
-
import java.util.Collection;
import java.util.EventListener;
import java.util.Vector;
@@ -103,8 +102,8 @@ public class PooledConnectionProxy imple
void notifyListeners() {
ConnectionEvent event = new ConnectionEvent(this);
Object[] listeners = eventListeners.toArray();
- for (int i = 0; i < listeners.length; i++) {
- ((ConnectionEventListener) listeners[i]).connectionClosed(event);
+ for (Object listener : listeners) {
+ ((ConnectionEventListener) listener).connectionClosed(event);
}
}
@@ -141,8 +140,8 @@ public class PooledConnectionProxy imple
@Override
public void connectionErrorOccurred(ConnectionEvent event) {
Object[] listeners = eventListeners.toArray();
- for (int i = 0; i < listeners.length; i++) {
- ((ConnectionEventListener) listeners[i]).connectionErrorOccurred(event);
+ for (Object listener : listeners) {
+ ((ConnectionEventListener) listener).connectionErrorOccurred(event);
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java Tue Feb 25 17:25:56 2014
@@ -178,9 +178,8 @@ public class TestPerUserPoolDataSource e
// get a new connection
c[0] = ds.getConnection("u1", "p1");
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
// open the maximum connections
@@ -188,9 +187,8 @@ public class TestPerUserPoolDataSource e
{
c[i] = ds.getConnection("u1", "p1");
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -268,9 +266,8 @@ public class TestPerUserPoolDataSource e
}
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -292,9 +289,8 @@ public class TestPerUserPoolDataSource e
// get a new connection
c[0] = ds.getConnection();
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -320,9 +316,8 @@ public class TestPerUserPoolDataSource e
// throw an exception
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java Tue Feb 25 17:25:56 2014
@@ -183,9 +183,8 @@ public class TestSharedPoolDataSource ex
// get a new connection
c[0] = ds.getConnection("u1", "p1");
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
// open the maximum connections
@@ -193,9 +192,8 @@ public class TestSharedPoolDataSource ex
{
c[i] = ds.getConnection("u1", "p1");
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -273,9 +271,8 @@ public class TestSharedPoolDataSource ex
}
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -297,9 +294,8 @@ public class TestSharedPoolDataSource ex
// get a new connection
c[0] = ds.getConnection();
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -337,9 +333,8 @@ public class TestSharedPoolDataSource ex
// throw an exception
}
- for (int i=0; i<c.length; i++)
- {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
@@ -368,8 +363,7 @@ public class TestSharedPoolDataSource ex
}
// Wait for all the threads to complete
- for (int i = 0; i < pts.length; i++) {
- final PoolTest poolTest = pts[i];
+ for (final PoolTest poolTest : pts) {
poolTest.getThread().join();
}
@@ -383,8 +377,8 @@ public class TestSharedPoolDataSource ex
assertTrue((end-start) < (2 * maxWaitMillis));
// Put all the connections back in the pool
- for (int i=0; i<c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java Tue Feb 25 17:25:56 2014
@@ -154,8 +154,8 @@ public class TestManagedDataSource exten
Assert.assertEquals(
((DelegatingConnection<?>) c[0]).getInnermostDelegateInternal(),
((DelegatingConnection<?>) con).getInnermostDelegateInternal());
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
ds.setAccessToUnderlyingConnectionAllowed(true);
}
@@ -176,8 +176,8 @@ public class TestManagedDataSource exten
Assert.assertEquals(
((DelegatingConnection<?>) c[0]).getInnermostDelegateInternal(),
((DelegatingConnection<?>) con).getInnermostDelegateInternal());
- for (int i = 0; i < c.length; i++) {
- c[i].close();
+ for (Connection element : c) {
+ element.close();
}
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java?rev=1571756&r1=1571755&r2=1571756&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java Tue Feb 25 17:25:56 2014
@@ -89,8 +89,8 @@ public class TestManagedDataSourceInTx e
((DelegatingConnection<?>) conn[i]).getInnermostDelegateInternal());
}
}
- for(int i=0;i<conn.length;i++) {
- conn[i].close();
+ for (Connection element : conn) {
+ element.close();
}
}