Scarab commit: svn commit: r11103 - branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java

Author: mcoss
Date: 2012-04-12 23:53:39-0700
New Revision: 11103

Modified:
   branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java

Log:
FIX - Delete active depends only for deleted issues.

Modified: branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java?view=diff&pathrev=11103&r1=11102&r2=11103
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java	(original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/om/Issue.java	2012-04-12 23:53:39-0700
@@ -3203,16 +3203,20 @@
             for (Iterator it = dependencies.iterator(); it.hasNext(); )
             {
                 Depend depend = (Depend)it.next();
-                ActivitySet deleteSet = 
-                    this.doDeleteDependency(activitySet, depend, user);
-                for (Iterator act = deleteSet.getActivityList().iterator(); act.hasNext(); )
-                {
-                    activitySet.addActivity((Activity)act.next());
-                }
-                NotificationManagerFactory.getInstance()
-                        .addActivityNotification(ActivityType.ISSUE_DELETED,
-                                activitySet, this, user);
+                if(!depend.getDeleted()){
+                	ActivitySet deleteSet = 
+                        this.doDeleteDependency(activitySet, depend, user);
+                    for (Iterator act = deleteSet.getActivityList().iterator(); act.hasNext(); )
+                    {
+                        activitySet.addActivity((Activity)act.next());
+                    }
+                }        
             }
+            
+            NotificationManagerFactory.getInstance()
+            .addActivityNotification(ActivityType.ISSUE_DELETED,
+                    activitySet, this, user);
+            
             save();
         }
     }    
@@ -4334,4 +4338,4 @@
         if(super.getLastTransId()==null)
             super.setLastTransId(createdTransId);
     }
-}
+}
\ No newline at end of file

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