Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Jevica Arianne B. Zurbano 2009-08-13 11:00:51 +00:00
parent 11135fe668
commit 1c301353ac
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
View File

@ -337,7 +337,12 @@ public class ProjectModelMerge
while ( keys.hasMoreElements() ) while ( keys.hasMoreElements() )
{ {
String key = (String) keys.nextElement(); 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; return merged;