You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/24 03:54:18 UTC

[3/5] git commit: [MRM-1833] Nullpointer when browsing artifacts which have dependencies with scope "import"

[MRM-1833] Nullpointer when browsing artifacts which have dependencies
with scope "import"

Use the full constructor to create the clone, as resolveModel expects
remoteRepositories to be not null


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6790e2a8
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6790e2a8
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6790e2a8

Branch: refs/heads/master
Commit: 6790e2a82fbf43eb407acfb8430f323f6a004bcd
Parents: 588f40d
Author: Sascha Vogt <sa...@vogt-neuenbuerg.de>
Authored: Wed Apr 23 15:37:56 2014 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:52:24 2014 +1000

----------------------------------------------------------------------
 .../repository/storage/maven2/RepositoryModelResolver.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/6790e2a8/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
index 0113513..0cb9264 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
@@ -212,7 +212,8 @@ public class RepositoryModelResolver
     @Override
     public ModelResolver newCopy()
     {
-        return new RepositoryModelResolver( basedir, pathTranslator );
+        return new RepositoryModelResolver( managedRepository,  pathTranslator, wagonFactory, remoteRepositories, 
+                                            networkProxyMap, targetRepository );
     }
 
     // FIXME: we need to do some refactoring, we cannot re-use the proxy components of archiva-proxy in maven2-repository