[jbpm-commits] JBoss JBPM SVN: r4992 - jbpm4/tags/jbpm-4.0.CR1/modules/pvm/src/main/java/org/jbpm/pvm/internal/task.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-06-04 08:55:57 -0400 (Thu, 04 Jun 2009)
New Revision: 4992

Modified:
   jbpm4/tags/jbpm-4.0.CR1/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
Log:
fixing regression in task query

Modified: jbpm4/tags/jbpm-4.0.CR1/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/tags/jbpm-4.0.CR1/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java	2009-06-04 12:54:38 UTC (rev 4991)
+++ jbpm4/tags/jbpm-4.0.CR1/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java	2009-06-04 12:55:57 UTC (rev 4992)
@@ -66,12 +66,8 @@
   }
 
   public TaskQuery candidate(String userId) {
-    if (assignee!=null) {
-      throw new JbpmException("assignee(...) cannot be combined with candidate(...) in one query");
-    }
     this.candidate = userId;
-    this.assignee = null;
-    this.unassigned = true;
+    unassigned();
     return this;
   }
 
@@ -97,7 +93,7 @@
   }
 
   protected void applyParameters(Query query) {
-    if (! unassigned) {
+    if (assignee!=null) {
       log.debug("setting parameter assignee: "+assignee);
       query.setString("assignee", assignee);
     }
@@ -114,7 +110,7 @@
   }
 
   public String hql() {
-  	StringBuilder hql = new StringBuilder();
+    StringBuilder hql = new StringBuilder();
     hql.append("select distinct task ");
     hql.append("from ");
     hql.append(TaskImpl.class.getName());
@@ -146,10 +142,10 @@
 
     appendWhereClause("task.state != '"+Task.STATE_SUSPENDED+"' ", hql);
 
-    if (unassigned) {
-      appendWhereClause("task.assignee is null ", hql);
-    } else if (assignee != null) {
+    if (assignee!=null) {
       appendWhereClause("task.assignee = :assignee ", hql);
+    } else if (unassigned) {
+      appendWhereClause("task.assignee is null ", hql);
     }
 
     appendOrderByClause(hql);