[MRM-1204] - org.apache.maven.archiva.repository.project.ProjectModelMerge.merge...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@803840 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
index 01d8e9f2815e6acde9dc9fa00d205fc7d3b75c7a..a5b95987264c6942bb19323b9893ad6a9952e04d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
@@ -337,7 +337,12 @@ public class ProjectModelMerge
         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;