Scarab commit: svn commit: r10997 - branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java

Author: jhoech
Date: 2010-04-19 08:21:06-0700
New Revision: 10997

Modified:
   branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java

Log:
FIX - Fix for duplicated references of dependencies in history tab.

Modified: branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&pathrev=10997&r1=10996&r2=10997
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/actions/ModifyIssue.java	2010-04-19 08:21:06-0700
@@ -1310,14 +1310,17 @@
             ActivitySet activitySet = null;
             try
             {
-                Issue workingIssue = issue;
                 if (needRoleSwitch)
                 {
                     depend.exchangeRoles();
-                    workingIssue = childIssue;
+                    activitySet = issue
+                    .doAddDependency(activitySet, depend, childIssue, user);
                 }
-                activitySet = issue
-                    .doAddDependency(activitySet, depend, workingIssue, user);
+                else{
+                    activitySet = childIssue
+                    .doAddDependency(activitySet, depend, issue, user);
+                }
+
             }
             catch (ScarabException se)
             {
@@ -1414,10 +1417,10 @@
                     newDepend.exchangeRoles();
                 }
                 
-                // make the changes
-                activitySet = 
-                    workingIssue.doChangeDependencyType(activitySet, oldDepend,
-                                                 newDepend, user);
+                 // make the changes
+                  activitySet = 
+                  workingIssue.doChangeDependencyType(activitySet, oldDepend,
+                                                      newDepend, user);
             }
             intake.remove(group);
         }

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2589350