Scarab commit: svn commit: r11372 - branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java

Author: dabbous
Date: 2017-04-18 12:22:47-0700
New Revision: 11372

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

Log:
error with determining the time to wait for autoclose

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=11372&r1=11371&r2=11372
==============================================================================
--- 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	2017-04-18 12:22:47-0700
@@ -1169,6 +1169,20 @@
                 int finals_index = (index < autocloseFinalStates.size())? index: autocloseFinalStates.size() - 1;
                 String periods = (String)autoclosePeriods.get(periods_index);
                 period = 1000*60*Long.parseLong(periods); // expect period in minutes
+                
+                Issue issue = null;
+                String issueId = "...";
+                
+                try {
+                    issue = aval.getIssue();
+                    issueId = issue.getUniqueId();
+                } catch (TorqueException e2) 
+                {
+                    log.error("checkAutoclose(): aval has no issue");
+                    e2.printStackTrace();
+                    return 0;
+                }
+                
                 if (issueTime > period)
                 {
                     String finalState = (String)autocloseFinalStates.get(finals_index);
@@ -1180,7 +1194,7 @@
 
                     AttributeValue aval2;
                     try {
-                        Issue issue = aval.getIssue();
+                        
                         String username = Environment.getConfigurationProperty("scarab.common.autoclose.user", null);
                         ScarabUser user = null;
                         if (username != null)
@@ -1203,23 +1217,17 @@
                         return 1;
                     }
                     catch (TorqueException e) {
-                        log.error("checkAutoclose(): Could not change State value", e);
+                        log.error("checkAutoclose(): Got TorqueException", e);
                         return 0;
                     } catch (ScarabException e) {
-                        // TODO Auto-generated catch block
+                        log.error("checkAutoclose(): Got ScarabException", e);
                         e.printStackTrace();
                     }
                 }
                 else 
                 {
-                    Issue issue;
-                    try {
-                        issue = aval.getIssue();
-                        log.info("autoclose: issue " + issue.getUniqueId() + " fires in " + (period-issueTime)/1000 + " seconds" );
-                        return 1;
-                    } catch (TorqueException e) {
-                        e.printStackTrace();
-                    }                    
+                    log.info("autoclose: issue " + issueId + " fires in " + (period-issueTime)/1000 + " seconds" );
+                    return 1;                  
                 }
                 return 0;
             }

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