svn commit: r575243 - /maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java

[jd...@apache.org]

Author: jdillon
Date: Thu Sep 13 02:35:55 2007
New Revision: 575243

URL: http://svn.apache.org/viewvc?rev=575243&view=rev
Log:
Fixed small problem that can occur when a jar has a components.xml which only contains: <component-set/> (which is perfectly valid, though not so useful)
So if this is the case, simply skip and move on

Modified:
    maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java

Modified: maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=575243&r1=575242&r2=575243&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java (original)
+++ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java Thu Sep 13 02:35:55 2007
@@ -89,7 +89,13 @@
         {
             throw new IOException( "Error parsing components.xml in " + is );
         }
-
+        
+        // Only try to merge in components if there are some elements in the component-set
+        if ( newDom.getChild( "components" ) == null )
+        {
+            return;
+        }
+        
         Xpp3Dom[] children = newDom.getChild( "components" ).getChildren( "component" );
 
         for ( int i = 0; i < children.length; i++ )