ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r644464 - /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Date Thu, 03 Apr 2008 20:07:42 GMT
Author: xavier
Date: Thu Apr  3 13:07:41 2008
New Revision: 644464

URL: http://svn.apache.org/viewvc?rev=644464&view=rev
Log:
mostly revert changes for IVY-437

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java?rev=644464&r1=644463&r2=644464&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java Thu Apr
 3 13:07:41 2008
@@ -225,13 +225,8 @@
     }
 
     public void ensureConfigured(ResolverSettings settings) {
-        Message.debug("Current IBIBLIO ROOT: " + root);
-        boolean isDefaultRoot = (root == null 
-                || (!isM2compatible() && root.equalsIgnoreCase(DEFAULT_ROOT))
-                || (isM2compatible() && root.equalsIgnoreCase(DEFAULT_M2_ROOT)));
-        Message.debug("Current settings: " + settings);
-        if (settings != null && (isDefaultRoot || pattern == null)) {
-            if (isDefaultRoot) {
+        if (settings != null && (root == null || pattern == null)) {
+            if (root == null) {
                 String root = settings.getVariable("ivy.ibiblio.default.artifact.root");
                 if (root != null) {
                     this.root = root;



Mime
View raw message