Author: jzurbano
Date: Thu Jan 27 11:17:18 2011
New Revision: 1064082
URL: http://svn.apache.org/viewvc?rev=1064082&view=rev
Log:
[MRM-1451] NPE when merging through XMLRPC
* applied patch
Patch Submitted by: Maria Catherine Tan
* passed metadataRepository instead of null during merge
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=1064082&r1=1064081&r2=1064082&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Thu Jan 27 11:17:18 2011
@@ -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
