Scarab commit: svn commit: r11345 - branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab: notification om

Author: dabbous
Date: 2014-06-26 13:43:05-0700
New Revision: 11345

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/om/Activity.java

Log:
prevent an NPE in the notification managaer, when no wakeup date is given for an on hold issue

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&pathrev=11345&r1=11344&r2=11345
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	2014-06-26 13:43:05-0700
@@ -452,14 +452,18 @@
                 NotificationStatus ns = iter.next();
                 Activity activity = ns.getActivity();
                 Calendar endDate = new GregorianCalendar();
-                endDate.setTime(activity.getEndDate()); // that is the onHoldExpiration date
+                Date date = activity.getEndDate();
+                if(date == null)
+                {
+                    continue;
+                }
+                endDate.setTime(date); // that is the onHoldExpiration date
                 if (endDate.before(now)) // onHold expired
                 {
                     Issue issue = activity.getIssue();
                     // onHoldTimeout reached.
                     boolean notificationNeeded = false;
                     
-                    Calendar changeDate = new GregorianCalendar();
                     Date lastChangeAt = ns.getChangeDate();
                     if(lastChangeAt == null)
                     {

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/om/Activity.java?view=diff&pathrev=11345&r1=11344&r2=11345
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/om/Activity.java	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/om/Activity.java	2014-06-26 13:43:05-0700
@@ -167,7 +167,8 @@
             }
         }
         // If they have just deleted a user assignment, set end date
-        if (getAttribute().isUserAttribute() && this.getNewUserId() == null && this.getOldUserId() != null)
+        Attribute attribute = getAttribute();
+        if (attribute != null && attribute.isUserAttribute() && this.getNewUserId() == null && this.getOldUserId() != null)
         {
             this.setEndDate(getActivitySet().getCreatedDate());
         }

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