Scarab commit: svn commit: r11028 - trunk/src/java/org/tigris/scarab/om/ActivitySet.java

Author: dabbous
Date: 2010-11-24 07:09:58-0800
New Revision: 11028

Modified:
   trunk/src/java/org/tigris/scarab/om/ActivitySet.java

Log:
Fix for SCB3055
The check for sealed issues apparently fails when no current activitySet does exist for an issue. i believe that in this case a "item not found exceptions" is generated when processing the iterator() aover all activities. (Not sure if that is true)

Modified: trunk/src/java/org/tigris/scarab/om/ActivitySet.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ActivitySet.java?view=diff&pathrev=11028&r1=11027&r2=11028
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ActivitySet.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ActivitySet.java	2010-11-24 07:09:58-0800
@@ -253,26 +253,31 @@
             {
                 
                 List<Activity> activities = getActivityList();
-                Iterator<Activity> iter = activities.iterator();
-                
-                Activity act = null;
-                while((act = iter.next()) != null)
+                if (activities != null)
                 {
-                    ActivityType at = ActivityType.getActivityType(act.getActivityType());
-                    if(at == ActivityType.ATTRIBUTE_CHANGED)
+                    Iterator<Activity> iter = activities.iterator();
+                    if (iter != null)
                     {
-                        Attribute att = act.getAttribute();
-                        String name = att.getName();
-                        if(name.equals(status))
+                        Activity act = null;
+                        while((act = iter.next()) != null)
                         {
-                           String oldv = act.getOldValue();
-                           String newv = act.getNewValue();
-                           
-                           if(oldv.equals(value) || newv.equals(value))
-                           {
-                               result = true;
-                               break;
-                           }
+                            ActivityType at = ActivityType.getActivityType(act.getActivityType());
+                            if(at == ActivityType.ATTRIBUTE_CHANGED)
+                            {
+                                Attribute att = act.getAttribute();
+                                String name = att.getName();
+                                if(name.equals(status))
+                                {
+                                   String oldv = act.getOldValue();
+                                   String newv = act.getNewValue();
+                                   
+                                   if(oldv.equals(value) || newv.equals(value))
+                                   {
+                                       result = true;
+                                       break;
+                                   }
+                                }
+                            }
                         }
                     }
                 }

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