svn commit: r803840 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java

[jzurbano]

Author: jzurbano
Date: Thu Aug 13 11:00:51 2009
New Revision: 803840

URL: http://svn.apache.org/viewvc?rev=803840&view=rev
Log:
[MRM-1204] - 
org.apache.maven.archiva.repository.project.ProjectModelMerge.merge throws NPE

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java?rev=803840&r1=803839&r2=803840&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
 Thu Aug 13 11:00:51 2009
@@ -337,7 +337,12 @@
         while ( keys.hasMoreElements() )
         {
             String key = (String) keys.nextElement();
-            merged.put( key, merge( mainProperties.getProperty( key ), 
parentProperties.getProperty( key ) ) );
+            String value = merge( mainProperties.getProperty( key ), 
parentProperties.getProperty( key ) );
+            
+            if ( value != null )
+            {
+                merged.put( key, value );
+            }
         }
 
         return merged;