Return-Path: 
 <commits-return-4996-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 25013 invoked from network); 1 Mar 2007 18:37:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Mar 2007 18:37:44 -0000
Received: (qmail 15528 invoked by uid 500); 1 Mar 2007 18:37:52 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 15508 invoked by uid 500); 1 Mar 2007 18:37:52 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 15499 invoked by uid 99); 1 Mar 2007 18:37:52 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 10:37:52 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 10:37:43 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 285FD1A981D; Thu,  1 Mar 2007 10:37:23 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r513433 - in /activemq/activeio/trunk/activeio-core:
 pom.xml
 src/main/java/org/apache/activeio/journal/active/LogFileManager.java
Date: Thu, 01 Mar 2007 18:37:23 -0000
To: commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070301183723.285FD1A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Thu Mar  1 10:37:22 2007
New Revision: 513433

URL: http://svn.apache.org/viewvc?view=rev&rev=513433
Log:
applied patch for AMQ-1184

Modified:
    activemq/activeio/trunk/activeio-core/pom.xml
    activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java

Modified: activemq/activeio/trunk/activeio-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activeio/trunk/activeio-core/pom.xml?view=diff&rev=513433&r1=513432&r2=513433
==============================================================================
--- activemq/activeio/trunk/activeio-core/pom.xml (original)
+++ activemq/activeio/trunk/activeio-core/pom.xml Thu Mar  1 10:37:22 2007
@@ -31,7 +31,7 @@
   <build>
     <plugins>
 
-      <!-- Use 1.5 compiler setting -->
+<!--
      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -40,7 +40,7 @@
           <target>1.5</target>
         </configuration>
       </plugin>
-
+-->
       <!-- generate the attached tests jar -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>

Modified: activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewvc/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java?view=diff&rev=513433&r1=513432&r2=513433
==============================================================================
--- activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java (original)
+++ activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java Thu Mar  1 10:37:22 2007
@@ -26,6 +26,7 @@
 import java.nio.ByteBuffer;
 import java.text.NumberFormat;
 import java.util.HashMap;
+import java.util.Iterator;
 
 import org.apache.activeio.adapter.PacketOutputStream;
 import org.apache.activeio.adapter.PacketToInputStream;
@@ -275,8 +276,9 @@
 	            log = log.getNext();
 	        } while (log != firstNode);
 
-            for (Object entry : openArchivedLogs.values()) {
-                ((LogFile)entry).dispose();
+			Iterator iter = openArchivedLogs.values().iterator();
+			while (iter.hasNext()) {
+			    ((LogFile)iter.next()).dispose();
             }
 
             loadedFromCleanShutDown=true;