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

Posted to commits@maven.apache.org by jd...@apache.org on 2009/07/11 00:20:41 UTC

svn commit: r793127 - /maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java

Author: jdcasey
Date: Fri Jul 10 22:20:40 2009
New Revision: 793127

URL: http://svn.apache.org/viewvc?rev=793127&view=rev
Log:
null check for wagon components list.

Modified:
    maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java

Modified: maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=793127&r1=793126&r2=793127&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Fri Jul 10 22:20:40 2009
@@ -266,8 +266,11 @@
         if ( extensionContainer != null )
         {
             Map wagons = extensionContainer.getComponentDescriptorMap( Wagon.ROLE );
-            getLogger().debug( "Wagons to register: " + wagons.keySet() );
-            wagonManager.registerWagons( wagons.keySet(), extensionContainer );
+            if ( wagons != null && !wagons.isEmpty() )
+            {
+                getLogger().debug( "Wagons to register: " + wagons.keySet() );
+                wagonManager.registerWagons( wagons.keySet(), extensionContainer );
+            }
         }
         else
         {