Attachment 886142 Details for Bug 1087474 – Patch proposal, including test case

[patch] Patch proposal, including test case

BZ-1087474.patch (text/plain), 5.49 KB, created by Martin Weiler on 2014-04-14 13:45:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Weiler

Created: 2014-04-14 13:45:00 UTC

Size: 5.49 KB

patch

obsolete

>diff --git a/jbpm-human-task/src/main/java/org/jbpm/task/service/TaskClientHandler.java b/jbpm-human-task/src/main/java/org/jbpm/task/service/TaskClientHandler.java
>index 18f7df5..9302000 100644
>--- a/jbpm-human-task/src/main/java/org/jbpm/task/service/TaskClientHandler.java
>+++ b/jbpm-human-task/src/main/java/org/jbpm/task/service/TaskClientHandler.java
>@@ -219,7 +219,7 @@ public class TaskClientHandler {
>                 break;
>             }
>             case QueryGenericResponse: {
>-            	QueryGenericResponseHandler responseHandler = (QueryGenericResponseHandler) responseHandlers.get(cmd.getId());
>+            	QueryGenericResponseHandler responseHandler = (QueryGenericResponseHandler) responseHandlers.remove(cmd.getId());
>             	if (responseHandler != null) {
>             		if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof RuntimeException) {
>             			responseHandler.setError((RuntimeException) cmd.getArguments().get(0));
>@@ -308,4 +308,4 @@ public class TaskClientHandler {
>     		ResponseHandler {
>     	public void execute(List<?> results);
>     }
>-}
>\ No newline at end of file
>+}
>diff --git a/jbpm-human-task/src/test/java/org/jbpm/task/service/base/async/TaskServiceLifeCycleBaseAsyncTest.java b/jbpm-human-task/src/test/java/org/jbpm/task/service/base/async/TaskServiceLifeCycleBaseAsyncTest.java
>index 8724397..c969007 100644
>--- a/jbpm-human-task/src/test/java/org/jbpm/task/service/base/async/TaskServiceLifeCycleBaseAsyncTest.java
>+++ b/jbpm-human-task/src/test/java/org/jbpm/task/service/base/async/TaskServiceLifeCycleBaseAsyncTest.java
>@@ -17,6 +17,7 @@
> package org.jbpm.task.service.base.async;
> 
> import java.io.StringReader;
>+import java.lang.reflect.Field;
> import java.util.ArrayList;
> import java.util.List;
> import java.util.Map;
>@@ -27,6 +28,7 @@ import org.jbpm.task.service.*;
> import org.jbpm.task.service.responsehandlers.BlockingAddTaskResponseHandler;
> import org.jbpm.task.service.responsehandlers.BlockingGetContentResponseHandler;
> import org.jbpm.task.service.responsehandlers.BlockingGetTaskResponseHandler;
>+import org.jbpm.task.service.responsehandlers.BlockingQueryGenericResponseHandler;
> import org.jbpm.task.service.responsehandlers.BlockingTaskOperationResponseHandler;
> import org.jbpm.task.service.responsehandlers.BlockingTaskSummaryResponseHandler;
> 
>@@ -1924,5 +1926,68 @@ public abstract class TaskServiceLifeCycleBaseAsyncTest extends BaseTest {
>         List<TaskSummary> salaboyTasks = responseHandler.getResults();
>         assertEquals(0, salaboyTasks.size());
>     } 
>-    
>+
>+    /*
>+     * Test to verify if BlockingQueryGenericResponseHandler instances are
>+     * cleared from the BaseClientHandler.responseHandlers map after execution.
>+     */
>+    public void testQueryBZ1087474() {
>+        Map<String, Object> vars = fillVariables();
>+
>+        // One potential owner, should go straight to state Reserved
>+        String str = "(with (new Task()) { priority = 55, taskData = (with( new TaskData()) { } ), ";
>+        str += "peopleAssignments = (with ( new PeopleAssignments() ) { }),";
>+        str += "names = [ new I18NText( 'en-UK', 'This is my task name')] })";
>+
>+        BlockingAddTaskResponseHandler addTaskResponseHandler = new BlockingAddTaskResponseHandler();
>+        Task task = ( Task )  eval( new StringReader( str ), vars );
>+        client.addTask( task, null, addTaskResponseHandler );
>+
>+        long taskId = addTaskResponseHandler.getTaskId();
>+
>+        // now check task data using some generic queries
>+        BlockingQueryGenericResponseHandler queryGenericResponseHandler = new BlockingQueryGenericResponseHandler();
>+		// hql to get status id from task table
>+		String hsql = "select t.taskData.status from Task t where t.id = " + taskId;
>+
>+		client.query(hsql, 1, 0, queryGenericResponseHandler);
>+		List<?> resultList = queryGenericResponseHandler.getResults();
>+		assertEquals( 1, resultList.size());
>+
>+        // a second query
>+        BlockingQueryGenericResponseHandler queryGenericResponseHandler2 = new BlockingQueryGenericResponseHandler();
>+		// hql to get status id from task table
>+		hsql = "select t.taskData.documentContentId from Task t where t.id = " + taskId;
>+
>+		client.query(hsql, 1, 0, queryGenericResponseHandler2);
>+		resultList = queryGenericResponseHandler2.getResults();
>+		assertEquals( 1, resultList.size());
>+
>+        // a third query
>+        BlockingQueryGenericResponseHandler queryGenericResponseHandler3 = new BlockingQueryGenericResponseHandler();
>+		// hql to get status id from task table
>+		hsql = "select t.taskData.activationTime from Task t where t.id = " + taskId;
>+
>+		client.query(hsql, 1, 0, queryGenericResponseHandler3);
>+		resultList = queryGenericResponseHandler3.getResults();
>+		assertEquals( 1, resultList.size());
>+
>+		// check the size of responseHandlers map using reflection
>+		try {
>+		    TaskClient t = (TaskClient) client;
>+		    Field handler = t.getClass().getDeclaredField("handler");
>+		    handler.setAccessible(true);
>+		    BaseClientHandler taskClientHandler = (BaseClientHandler) handler.get(t);
>+		    System.out.println(" TaskClient handler = " + taskClientHandler);
>+
>+		    Field responseHandlersField = taskClientHandler.getClass().getSuperclass().getDeclaredField("responseHandlers");
>+		    responseHandlersField.setAccessible(true);
>+		    Map responseHandlers = (Map) responseHandlersField.get(taskClientHandler);
>+
>+		    // responseHandlers map should be zero
>+		    assertEquals(0, responseHandlers.size());
>+		} catch (Exception e) {
>+		    e.printStackTrace();
>+		}
>+    }
> }

Actions: View | Diff

Attachments on bug 1087474: 886142