Scarab commit: svn commit: r10280 - branches/release/b21/src/java/org/tigris/scarab: notification om

Author: dabbous
Date: 2006-09-06 14:41:04-0700
New Revision: 10280

Modified:
   branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
   branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java

Log:
expected to solve SCB1877

Modified: branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10280&p1=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10279&r2=10280
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2006-09-06 14:41:04-0700
@@ -215,6 +215,11 @@
         log.debug("sendPendingNotifications(): Collect pending notifications ...");
         List pending = NotificationStatusPeer.getPendingNotifications();
 
+        if(pending == null)
+        {
+            log.warn("sendPendingNotifications(): ...Could not retrieve pending notifications from Database. Try again later.");
+            return;
+        }
         log.debug("rearrange pending notifications per issue ...");
         Map pendingIssueMap = getPendingIssueMap(pending);
 

Modified: branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java?view=diff&rev=10280&p1=branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java&r1=10279&r2=10280
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatusPeer.java	2006-09-06 14:41:04-0700
@@ -68,12 +68,14 @@
 		List pending = null;
 		Criteria crit = new Criteria();
 		crit.add(NotificationStatusPeer.STATUS, NotificationStatus.SCHEDULED, Criteria.EQUAL);
-		try {
+		try 
+        {
 			pending = doSelect(crit);
-		} catch (TorqueException e) {
+            Collections.sort(pending);
+		} catch (TorqueException e) 
+        {
 			log.error("getPendingNotifications(): " + e);
 		}
-		Collections.sort(pending);
 		return pending;
 	}
 }