Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 47046 invoked from network); 15 Oct 2004 14:38:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Oct 2004 14:38:16 -0000 Received: (qmail 84301 invoked by uid 500); 15 Oct 2004 14:38:12 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 84141 invoked by uid 500); 15 Oct 2004 14:38:10 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 84126 invoked by uid 99); 15 Oct 2004 14:38:10 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 15 Oct 2004 07:38:10 -0700 Received: (qmail 46911 invoked by uid 1203); 15 Oct 2004 14:38:08 -0000 Date: 15 Oct 2004 14:38:08 -0000 Message-ID: <20041015143808.46910.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/attachments ManagedMemoryDataSource.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dims 2004/10/15 07:38:08 Modified: java/src/org/apache/axis/attachments ManagedMemoryDataSource.java Log: Fix for AXIS-1584 - ConcurrentModificationException in ManagedMemoryDataSource class Revision Changes Path 1.35 +3 -5 ws-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java Index: ManagedMemoryDataSource.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ManagedMemoryDataSource.java 26 Apr 2004 11:51:43 -0000 1.34 +++ ManagedMemoryDataSource.java 15 Oct 2004 14:38:08 -0000 1.35 @@ -449,10 +449,9 @@ cachediskstream = null; } - for (java.util.Iterator i = readers.keySet().iterator(); - i.hasNext();) { - Instream stream = (Instream) i.next(); - + Object[] array = readers.keySet().toArray(); + for (int i = 0; i < array.length; i++) { + Instream stream = (Instream) array[i]; if (null != stream) { try { stream.close(); @@ -460,7 +459,6 @@ } } } - readers.clear(); try {