You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2012/08/11 05:36:59 UTC
svn commit: r1371862 -
/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
Author: adrianc
Date: Sat Aug 11 03:36:58 2012
New Revision: 1371862
URL: http://svn.apache.org/viewvc?rev=1371862&view=rev
Log:
Removed unnecessary entity condition that I added earlier.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1371862&r1=1371861&r2=1371862&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Sat Aug 11 03:36:58 2012
@@ -278,15 +278,7 @@ public final class JobManager {
EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SERVICE_QUEUED"),
EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SERVICE_RUNNING"));
EntityCondition statusCondition = EntityCondition.makeCondition(statusExprList, EntityOperator.OR);
- List<EntityExpr> poolsExpr = UtilMisc.toList(EntityCondition.makeCondition("poolId", EntityOperator.EQUALS, null));
- List<String> pools = ServiceConfigUtil.getRunPools();
- if (pools != null) {
- for (String poolName : pools) {
- poolsExpr.add(EntityCondition.makeCondition("poolId", EntityOperator.EQUALS, poolName));
- }
- }
- EntityCondition poolCondition = EntityCondition.makeCondition(poolsExpr, EntityOperator.OR);
- EntityCondition mainCondition = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("runByInstanceId", instanceId), statusCondition, poolCondition));
+ EntityCondition mainCondition = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("runByInstanceId", instanceId), statusCondition));
try {
crashed = delegator.findList("JobSandbox", mainCondition, null, UtilMisc.toList("startDateTime"), null, false);
} catch (GenericEntityException e) {