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

Author: dabbous
Date: 2017-04-18 11:45:38-0700
New Revision: 11370

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

Log:
finalstate property shoul dbe a list named finals

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=11370&r1=11369&r2=11370
==============================================================================
--- 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 11:45:38-0700
@@ -1156,6 +1156,7 @@
     {
 
         List<Object> autocloseInitialStates = Environment.getConfigurationValues("scarab.common.autoclose.states", null);
+        List<Object> autocloseFinalStates = Environment.getConfigurationValues("scarab.common.autoclose.finals", null);
         List<Object> autoclosePeriods = Environment.getConfigurationValues("scarab.common.autoclose.periods", null);
 
         long period = 0;
@@ -1165,14 +1166,16 @@
             if (state.equalsIgnoreCase(aval.getValue()))
             {
                 int periods_index = (index < autoclosePeriods.size()) ? index: autoclosePeriods.size() - 1;
+                int finals_index = (index < autocloseFinalStates.size())? index: autocloseFinalStates.size() - 1;
                 String periods = (String)autoclosePeriods.get(periods_index);
+                String finalState = (String)autocloseFinalStates.get(finals_index);
                 period = 1000*60*Long.parseLong(periods); // expect period in minutes
                 if (issueTime > period)
                 {
-                    String finalState = Environment.getConfigurationProperty("scarab.common.autoclose.finalstate", null);
+                    //String finalState = Environment.getConfigurationProperty("scarab.common.autoclose.finalstate", null);
                     if(finalState == null)
                     {
-                        log.error("checkAutoclose(): config attribute 'scarab.common.autoclose.finalstate' not defined");
+                        log.error("checkAutoclose(): config attribute 'scarab.common.autoclose.finals' not defined");
                         return 0;
                     }

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