Author: hibou
Date: Sun Sep 13 12:39:35 2009
New Revision: 814307
URL: http://svn.apache.org/viewvc?rev=814307&view=rev
Log:
more precise fix for IVYDE-186
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java?rev=814307&r1=814306&r2=814307&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
Sun Sep 13 12:39:35 2009
@@ -25,6 +25,7 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.Configuration;
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
@@ -179,7 +180,7 @@
}
// Found one; check if it is for the module we need
- if
(md.getModuleRevisionId().getRevision().startsWith("working@")
+ if
(md.getModuleRevisionId().getRevision().equals(Ivy.getWorkingRevision())
|| versionMatcher.accept(dd.getDependencyRevisionId(),
md)) {
Artifact af = new
DefaultArtifact(md.getModuleRevisionId(), md
