From 1c301353ac7b03562dc59524016d1f29ed4a6b27 Mon Sep 17 00:00:00 2001 From: "Jevica Arianne B. Zurbano" Date: Thu, 13 Aug 2009 11:00:51 +0000 Subject: [PATCH] [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 --- .../archiva/repository/project/ProjectModelMerge.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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; -- 2.39.5