commit 24fd62b76af6c8b147381591c2fee0c55ff1ff7a
author Sarah McNamara <mcnamara@apache.org> Sat Aug 06 20:21:41 2005 +0000
committer Sarah McNamara <mcnamara@apache.org> Sat Aug 06 20:21:41 2005 +0000
tree 6475a4b3adec55a768882f8a30e06bca5774a66f
parent 13ca769fecc385d585dea02fdd3567142f62bc8a

Applying patch (XalanJ-2183-SqlExtension-DefConPoolFix.patch) from John Gentilin.
This patch fixes a problem with the default connection pool where we were using an
Iterator but in the Iterator look we were trying to remove elements in the Iterators's
collection. This caused a concurrent access error.
Reviewd by Yash Talwar.

src/org/apache/xalan/lib/sql/DefaultConnectionPool.java

diff --git a/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java b/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
index ea34a6d..934e0bc 100644
--- a/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
+++ b/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
@@ -139,7 +139,7 @@
         }
         
         pcon.close();
-        m_pool.remove(pcon);
+        i.remove();        
       }
     }