You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/10 00:55:10 UTC

svn commit: r355656 - /geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java

Author: djencks
Date: Fri Dec  9 15:55:07 2005
New Revision: 355656

URL: http://svn.apache.org/viewcvs?rev=355656&view=rev
Log:
GERONIMO-1320 make assembly plugin recursive on parents, fix previous commit

Modified:
    geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java?rev=355656&r1=355655&r2=355656&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java Fri Dec  9 15:55:07 2005
@@ -131,9 +131,11 @@
             }
         }
         URI[] parentId = (URI[]) config.getAttribute("parentId");
-        for (int i = 0; i < parentId.length; i++) {
-            URI parent = parentId[i];
-            execute(parent, installAdapter, sourceRepo, targetRepo);
+        if (parentId != null) {
+            for (int i = 0; i < parentId.length; i++) {
+                URI parent = parentId[i];
+                execute(parent, installAdapter, sourceRepo, targetRepo);
+            }
         }
     }