dirkv 2004/07/04 10:23:35
Modified: pool/src/java/org/apache/commons/pool/impl
StackObjectPool.java StackKeyedObjectPool.java
Log:
Bugzilla Bug 29912: [pool] Compilation under 1.5: enum keyword
- use unsynchronized iterator
Revision Changes Path
1.16 +5 -5
jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java
Index: StackObjectPool.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StackObjectPool.java 28 Feb 2004 11:46:33 -0000 1.15
+++ StackObjectPool.java 4 Jul 2004 17:23:35 -0000 1.16
@@ -17,7 +17,7 @@
package org.apache.commons.pool.impl;
import java.util.EmptyStackException;
-import java.util.Enumeration;
+import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Stack;
@@ -196,10 +196,10 @@
public synchronized void clear() {
assertOpen();
if(null != _factory) {
- Enumeration enum = _pool.elements();
- while(enum.hasMoreElements()) {
+ Iterator it = _pool.iterator();
+ while(it.hasNext()) {
try {
- _factory.destroyObject(enum.nextElement());
+ _factory.destroyObject(it.next());
} catch(Exception e) {
// ignore error, keep destroying the rest
}
1.15 +4 -5
jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
Index: StackKeyedObjectPool.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StackKeyedObjectPool.java 28 Feb 2004 12:16:21 -0000 1.14
+++ StackKeyedObjectPool.java 4 Jul 2004 17:23:35 -0000 1.15
@@ -16,7 +16,6 @@
package org.apache.commons.pool.impl;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -235,10 +234,10 @@
return;
} else {
if(null != _factory) {
- Enumeration enum = stack.elements();
- while(enum.hasMoreElements()) {
+ Iterator it = stack.iterator();
+ while(it.hasNext()) {
try {
- _factory.destroyObject(key,enum.nextElement());
+ _factory.destroyObject(key,it.next());
} catch(Exception e) {
// ignore error, keep destroying the rest
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
