diff options
| author | Jevica Arianne B. Zurbano <jzurbano@apache.org> | 2009-08-13 11:00:51 +0000 |
|---|---|---|
| committer | Jevica Arianne B. Zurbano <jzurbano@apache.org> | 2009-08-13 11:00:51 +0000 |
| commit | 1c301353ac7b03562dc59524016d1f29ed4a6b27 (patch) | |
| tree | f93281daf26027689b9ad9a6e0c60c131f864d71 | |
| parent | 11135fe668c7f439d23d4a215933db53a433eae3 (diff) | |
| download | archiva-1c301353ac7b03562dc59524016d1f29ed4a6b27.tar.gz archiva-1c301353ac7b03562dc59524016d1f29ed4a6b27.zip | |
[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
| -rw-r--r-- | archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java | 7 |
1 files changed, 6 insertions, 1 deletions
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; |