[jbpm-commits] JBoss JBPM SVN: r6656 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-09-10 17:34:51 -0400 (Fri, 10 Sep 2010)
New Revision: 6656

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java
Log:
JBPM-2813 avoid two successive calls to Clock.getTime;
log past due date message at debug level

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java	2010-09-10 03:39:56 UTC (rev 6655)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java	2010-09-10 21:34:51 UTC (rev 6656)
@@ -27,7 +27,6 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import org.jbpm.api.JbpmException;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.util.Clock;
 
@@ -109,16 +108,17 @@
       end = dayPart.subtract(date, millis, duration.isBusinessTime());
     }
 
-    if (end.before(Clock.getTime())) {
-        if (log.isWarnEnabled()) {
-          log.warn("Duedate : [" + end + "] in the past of start : [" + date + "]");
-        }
-        return Clock.getTime();
+    Date currentTime = Clock.getTime();
+    if (end.before(currentTime)) {
+      // log at debug level to avoid attracting attention over a valid case
+      if (log.isDebugEnabled()) {
+        log.debug("due date is in the past: " + end);
+      }
+      return currentTime;
     }
     return end;
   }
 
-
   public Date add(Date date, Duration duration) {
     Date end = null;
     DayPart dayPart = null;
@@ -198,21 +198,21 @@
   }
 
   protected Date findStartOfPreviousDay(Date date) {
-        Calendar calendar = createCalendar();
-        calendar.setTime(date);
-        calendar.add(Calendar.DATE, -1);
-        calendar.set(Calendar.HOUR_OF_DAY, 23);
-        calendar.set(Calendar.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-        calendar.set(Calendar.MILLISECOND, 999);
-        date = calendar.getTime();
-        while(isHoliday(date)) {
-          calendar.setTime(date);
-          calendar.add(Calendar.DATE, -1);
-          date = calendar.getTime();
-        }
-        return date;
-      }
+    Calendar calendar = createCalendar();
+    calendar.setTime(date);
+    calendar.add(Calendar.DATE, -1);
+    calendar.set(Calendar.HOUR_OF_DAY, 23);
+    calendar.set(Calendar.MINUTE, 59);
+    calendar.set(Calendar.SECOND, 59);
+    calendar.set(Calendar.MILLISECOND, 999);
+    date = calendar.getTime();
+    while(isHoliday(date)) {
+      calendar.setTime(date);
+      calendar.add(Calendar.DATE, -1);
+      date = calendar.getTime();
+    }
+    return date;
+  }
 
   public Calendar createCalendar() {
     return new GregorianCalendar();
@@ -267,8 +267,6 @@
     return nextDayPart;
   }
 
-
-
   // getters and setters //////////////////////////////////////////////////////
 
   public long getBusinessDayInMillis() {