[jboss-svn-commits] JBL Code SVN: r22828 - in labs/jbossrules/trunk/drools-process/drools-process-task/src: test/java/org/drools/task/service and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2008-09-16 23:42:25 -0400 (Tue, 16 Sep 2008)
New Revision: 22828

Modified:
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
Log:
JBRULES-1745 WS-Human-Task
-Fixed test on email work item to use different port to 25.

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java	2008-09-17 03:39:40 UTC (rev 22827)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java	2008-09-17 03:42:25 UTC (rev 22828)
@@ -108,7 +108,10 @@
                                          Deadline deadline,
                                          EntityManager em,
                                          TaskService service) {
-
+        if ( deadline == null || deadline.getEscalations() == null ) {
+            return;
+        }
+        
         for ( Escalation escalation : deadline.getEscalations() ) {
             // we won't impl constraints for now
             //escalation.getConstraints()

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java	2008-09-17 03:39:40 UTC (rev 22827)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java	2008-09-17 03:42:25 UTC (rev 22828)
@@ -16,6 +16,8 @@
 
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.drools.eventmessaging.EventKey;
+import org.drools.eventmessaging.Payload;
 import org.drools.process.instance.WorkItemManager;
 import org.drools.process.instance.impl.DefaultWorkItemManager;
 import org.drools.process.instance.impl.WorkItemImpl;
@@ -28,6 +30,8 @@
 import org.drools.task.Status;
 import org.drools.task.Task;
 import org.drools.task.User;
+import org.drools.task.event.TaskClaimedEvent;
+import org.drools.task.event.TaskEventKey;
 import org.drools.task.service.DefaultEscalatedDeadlineHandler;
 import org.mvel.MVEL;
 import org.mvel.compiler.ExpressionCompiler;