Scarab commit: svn commit: r10619 - trunk/src/java/org/tigris/scarab: notification util

Author: hair
Date: 2008-08-24 11:52:44-0700
New Revision: 10619

Modified:
   trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
   trunk/src/java/org/tigris/scarab/util/Email.java

Log:
Issue SCB845:  ( All emails from one issue belonging to same mail thread) 

Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10619&p1=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10618&r2=10619
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2008-08-24 11:52:44-0700
@@ -326,7 +326,7 @@
                     catch (Exception e)
                     {
                         exception = e;
-                        log.debug("Failed to send email :" + e);
+                        log.error("Failed to send email :" + e);
                     }
 
                     updateNotificationRepository(groupedActivities, exception);

Modified: trunk/src/java/org/tigris/scarab/util/Email.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/Email.java?view=diff&rev=10619&p1=trunk/src/java/org/tigris/scarab/util/Email.java&p2=trunk/src/java/org/tigris/scarab/util/Email.java&r1=10618&r2=10619
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/Email.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/Email.java	2008-08-24 11:52:44-0700
@@ -253,12 +253,18 @@
         }
 
         // Email threading -- applicable to issue related notifications
-        final Issue issue = (Issue) context.get("issue");
+        Issue issue = null;
         String emailReferences = null;
-        if(null!=issue)
+        if(context.containsKey("issue"))
         {
-            emailReferences = issue.getEmailReferences();
-            te.addHeader("References", emailReferences);
+            issue = (Issue) context.get("issue");
+            emailReferences = null != issue.getEmailReferences()
+                    ? issue.getEmailReferences()
+                    : "";
+            if(0 != emailReferences.length())
+            {
+                te.addHeader("References", emailReferences);
+            }
         }
 
         try