From: Jevica Arianne B. Zurbano <jzurbano@apache.org>
Date: Thu, 13 Aug 2009 11:00:51 +0000 (+0000)
Subject: [MRM-1204] - org.apache.maven.archiva.repository.project.ProjectModelMerge.merge... 
X-Git-Tag: archiva-1.2.2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1c301353ac7b03562dc59524016d1f29ed4a6b27;p=archiva.git

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

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 01d8e9f28..a5b959872 100644
--- 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;