From 0dfdcb94d68dcb69f42560751ae739f90f9cdd46 Mon Sep 17 00:00:00 2001
From: Xavier Hanin <xavier@apache.org>
Date: Mon, 3 Mar 2008 08:57:06 +0000
Subject: [PATCH] fix failing tests due to IVY-739 changes

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@632990 13f79535-47bb-0310-9956-ffa450edef68
---
 .../core/module/descriptor/DefaultDependencyDescriptor.java    | 1 +
 .../ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java b/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
index 0b628692..114a9336 100644
--- a/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
+++ b/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
@@ -203,6 +203,7 @@ public class DefaultDependencyDescriptor implements DependencyDescriptor {
     public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force, boolean changing) {
         md = null;
         revId = mrid;
+        dynamicRevId = mrid;
         isForce = force;
         isChanging = changing;
     }
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
index 4ce6af5d..06d2d5c0 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -384,7 +384,8 @@ public final class XmlModuleDescriptorUpdater {
                     String rev = (String) resolvedRevisions.get(systemMrid);
                     if (rev != null) {
                         write(" rev=\"" + rev + "\"");
-                        if (attributes.getIndex("revConstraint") == -1) {
+                        if (attributes.getIndex("revConstraint") == -1 
+                                && !rev.equals(systemMrid.getRevision())) {
                             write(" revConstraint=\"" + systemMrid.getRevision() + "\"");
                         }
                     } else {