[MODULES-195] Avoid infinite loop when iterating over modules.

jboss-modules · Jul 23, 2014 · 271dc35 · 271dc35
1 parent 56458db
commit 271dc35
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 6 deletions.
diff --git a/src/main/java/org/jboss/modules/ModuleLoader.java b/src/main/java/org/jboss/modules/ModuleLoader.java
@@ -264,14 +264,15 @@ public boolean hasNext() {
                         }
                         final ModuleFinder finder = finders[idx++];
                         if (finder instanceof IterableModuleFinder) {
-                            final Iterator<ModuleIdentifier> iterator = ((IterableModuleFinder) finder).iterateModules(baseIdentifier, recursive);
-                            if (iterator.hasNext()) {
-                                nested = iterator;
-                                return true;
-                            }
+                            nested = ((IterableModuleFinder) finder).iterateModules(baseIdentifier, recursive);
                         }
                     }
-                    if (! nested.hasNext()) nested = null;
+
+                    if (! nested.hasNext()) {
+                        nested = null;
+                    } else {
+                        return true;
+                    }
                 }
             }
 

diff --git a/src/test/java/org/jboss/modules/ModuleIteratorTest.java b/src/test/java/org/jboss/modules/ModuleIteratorTest.java
@@ -67,6 +67,56 @@ public void testMetaInfServicesIterator() throws Exception {
         Assert.assertFalse("No other resource", itres.hasNext());
     }
 
+    @Test
+    public void testIterateModules() throws Exception {
+        IterableModuleFinder fakeFinder = new IterableModuleFinder() {
+            private ModuleIdentifier[] modules = { ModuleIdentifier.create("a"), ModuleIdentifier.create("b")};
+
+            @Override
+            public Iterator<ModuleIdentifier> iterateModules(ModuleIdentifier baseIdentifier, boolean recursive) {
+                return new Iterator<ModuleIdentifier>() {
+                    private int pos = 0;
+
+                    @Override
+                    public boolean hasNext() {
+                        return pos < modules.length;
+                    }
+
+                    @Override
+                    public ModuleIdentifier next() {
+                        return modules[pos++];
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+
+            @Override
+            public ModuleSpec findModule(ModuleIdentifier identifier, ModuleLoader delegateLoader)
+                throws ModuleLoadException {
+                for (ModuleIdentifier m : modules) {
+                    if (m.equals(identifier)) {
+                        return ModuleSpec.build(m).create();
+                    }
+                }
+                return null;
+            }
+        };
+
+        ModuleLoader loader = new ModuleLoader(new ModuleFinder[]{fakeFinder});
+
+        Iterator<ModuleIdentifier> it = loader.iterateModules(null, true);
+        int count = 0;
+        while (it.hasNext()) {
+            it.next();
+            count++;
+        }
+
+        Assert.assertEquals(2, count);
+    }
 
     private JarFile toJarFile(JavaArchive archive) throws IOException {
         ZipExporter exporter = archive.as(ZipExporter.class);