svn commit: r513433 - in /activemq/activeio/trunk/activeio-core: pom.xml src/main/java/org/apache/activeio/journal/active/LogFileManager.java

[jstrachan]

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;