You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2015/02/08 15:05:57 UTC
[2/3] ant-ivy git commit: ant workspace resolver: avoid a NPE on not
found resolver
ant workspace resolver: avoid a NPE on not found resolver
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/e1188f36
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/e1188f36
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/e1188f36
Branch: refs/heads/master
Commit: e1188f368087ba4bcfada44d645e4f8661d7f9b2
Parents: 82bd5be
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Feb 8 14:20:55 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Feb 8 14:45:05 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/ivy/core/settings/IvySettings.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1188f36/src/java/org/apache/ivy/core/settings/IvySettings.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/settings/IvySettings.java b/src/java/org/apache/ivy/core/settings/IvySettings.java
index 5113cf5..b5f4849 100644
--- a/src/java/org/apache/ivy/core/settings/IvySettings.java
+++ b/src/java/org/apache/ivy/core/settings/IvySettings.java
@@ -915,9 +915,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
DependencyResolver resolver = resolversMap.get(resolverName);
if (resolver == null) {
Message.error("unknown resolver " + resolverName);
- }
- if (workspaceResolver != null && !(resolver instanceof WorkspaceChainResolver)) {
+ } else if (workspaceResolver != null && !(resolver instanceof WorkspaceChainResolver)) {
resolver = new WorkspaceChainResolver(this, resolver, workspaceResolver);
+ resolversMap.put(resolver.getName(), resolver);
resolversMap.put(resolverName, resolver);
}
return resolver;