From 55d4b5c3af3f8cebd79abfc1bbe711e8c120e134 Mon Sep 17 00:00:00 2001 From: "Jevica Arianne B. Zurbano" Date: Thu, 27 Jan 2011 11:17:18 +0000 Subject: [PATCH] [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 --- .../web/xmlrpc/services/AdministrationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java index 422960e22..0dc4cc127 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java @@ -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 -- 2.39.5