Author: gscokart
Date: Wed Nov 21 05:58:59 2007
New Revision: 597089
URL: http://svn.apache.org/viewvc?rev=597089&view=rev
Log:
revert handling of problem to something that should be similar to what was
before
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java?rev=597089&r1=597088&r2=597089&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
Wed Nov 21 05:58:59 2007
@@ -194,8 +194,6 @@
boolean loaded = false;
if (hasProblem()) {
Message.debug("Node has problem. Skip loading");
- handleConfiguration(loaded, rootModuleConf, parent, parentConf,
conf, shouldBePublic);
- return false;
} else if (isEvicted(rootModuleConf)) {
Message.debug(rootModuleConf + " is evicted. Skip loading");
} else if (!hasConfigurationsToLoad() &&
isRootModuleConfLoaded(rootModuleConf)) {
@@ -320,16 +318,18 @@
loaded = true;
}
}
- if (!handleConfiguration(loaded, rootModuleConf, parent, parentConf,
conf, shouldBePublic)) {
+ handleConfiguration(loaded, rootModuleConf, parent, parentConf, conf,
shouldBePublic);
+ if (hasProblem()) {
+ Message.debug("problem : " + problem.getMessage());
return false;
+ } else {
+ DependencyDescriptor dd = getDependencyDescriptor(parent);
+ if (dd != null) {
+ addDependencyArtifacts(rootModuleConf,
dd.getDependencyArtifacts(parentConf));
+ addDependencyIncludes(rootModuleConf,
dd.getIncludeRules(parentConf));
+ }
+ return loaded;
}
- DependencyDescriptor dd = getDependencyDescriptor(parent);
- if (dd != null) {
- addDependencyArtifacts(rootModuleConf,
dd.getDependencyArtifacts(parentConf));
- addDependencyIncludes(rootModuleConf,
dd.getIncludeRules(parentConf));
- }
- return loaded;
-
}
public Collection getDependencies(String rootModuleConf, String[] confs) {
