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

[MRM-1451] NPE when merging through XMLRPC 

* applied patch

Patch Submitted by: Maria Catherine Tan
* passed metadataRepository instead of null during merge



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1064082 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jevica Arianne B. Zurbano 2011-01-27 11:17:18 +00:00
parent 13609a81fe
commit 55d4b5c3af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
View File

@ -529,12 +529,12 @@ public class AdministrationServiceImpl
sourceArtifacts.removeAll( conflicts );
log.debug( "Source artifacts size :: " + sourceArtifacts.size() );
mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, null );
mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, metadataRepository );
}
else
{
log.debug( "Source artifacts size :: " + sourceArtifacts.size() );
mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, null );
mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, metadataRepository );
}
}
else