Backport VM 1.5 fix to 0.97.2

2008-05-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java:
	Remove use of 1.5 language constructs.

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e259d07a..a291fdd60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java:
+	Remove use of 1.5 language constructs.
+
 2008-06-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* tools/gnu/classpath/tools/common/ClasspathToolParser.java:
diff --git a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
index b9073319c..eade26374 100644
--- a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
+++ b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
@@ -42,6 +42,7 @@ import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
 
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -121,9 +122,11 @@ final class VMMemoryMXBeanImpl
    */
   private static MemoryUsage getUsage(MemoryType type) {
     long init = 0, committed = 0, used = 0, max = 0;
-    List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
-    for (MemoryPoolMXBean pool: pools)
+    Iterator pools =
+      ManagementFactory.getMemoryPoolMXBeans().iterator();
+    while (pools.hasNext())
       {
+	MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next();
 	if (pool.getType() == type)
 	  {
 	    MemoryUsage usage = pool.getUsage();