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 2006/02/20 18:44:28 UTC

svn commit: r379181 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java

Author: jdcasey
Date: Mon Feb 20 09:44:23 2006
New Revision: 379181

URL: http://svn.apache.org/viewcvs?rev=379181&view=rev
Log:
Merging in fix for MNG-2037.

Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java?rev=379181&r1=379180&r2=379181&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java Mon Feb 20 09:44:23 2006
@@ -138,6 +138,12 @@
 
     private void injectPlugins( PluginContainer profileContainer, PluginContainer modelContainer )
     {
+        if ( profileContainer == null || modelContainer == null )
+        {
+            // nothing to do...
+            return;
+        }
+        
         List modelPlugins = modelContainer.getPlugins();
 
         if ( modelPlugins == null )