Fixes IndexOutOfBoundsException on DirectoryTreeNodeFactoryProvider

thirdy · Jun 14, 2015 · dc7e03e · dc7e03e
1 parent a305719
commit dc7e03e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/services/src/main/groovy/jd/gui/service/treenode/DirectoryTreeNodeFactoryProvider.groovy b/services/src/main/groovy/jd/gui/service/treenode/DirectoryTreeNodeFactoryProvider.groovy
@@ -32,7 +32,7 @@ class DirectoryTreeNodeFactoryProvider extends AbstractTreeNodeFactoryProvider {
         // Aggregate directory names
         while (entries.size() == 1) {
             Entry child = entries[0]
-            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this)) break
+            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this) || (entry.container != child.container)) break
             entry = child
             entries = entry.children
         }

diff --git a/services/src/main/groovy/jd/gui/service/treenode/PackageTreeNodeFactoryProvider.groovy b/services/src/main/groovy/jd/gui/service/treenode/PackageTreeNodeFactoryProvider.groovy
@@ -29,7 +29,7 @@ class PackageTreeNodeFactoryProvider extends DirectoryTreeNodeFactoryProvider {
         // Aggregate directory names
         while (entries.size() == 1) {
             Container.Entry child = entries[0]
-            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this)) break
+            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this) || (entry.container != child.container)) break
             entry = child
             entries = entry.children
         }