You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/26 09:52:25 UTC
svn commit: r768681 - in /ofbiz/branches/release09.04: ./
framework/service/src/org/ofbiz/service/job/JobInvoker.java
Author: jleroux
Date: Sun Apr 26 07:52:25 2009
New Revision: 768681
URL: http://svn.apache.org/viewvc?rev=768681&view=rev
Log:
Applied fix from trunk for revision: 768675
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/job/JobInvoker.java
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 07:52:25 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675
Modified: ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/job/JobInvoker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/job/JobInvoker.java?rev=768681&r1=768680&r2=768681&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/job/JobInvoker.java (original)
+++ ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/job/JobInvoker.java Sun Apr 26 07:52:25 2009
@@ -20,11 +20,12 @@
import java.util.Date;
-import org.ofbiz.service.config.ServiceConfigUtil;
+import org.apache.commons.lang.math.NumberUtils;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
-import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.entity.transaction.GenericTransactionException;
+import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.service.config.ServiceConfigUtil;
/**
* JobInvoker
@@ -281,7 +282,7 @@
long ttl = THREAD_TTL;
try {
- ttl = Long.parseLong(ServiceConfigUtil.getElementAttr("thread-pool", "ttl"));
+ ttl = NumberUtils.toLong(ServiceConfigUtil.getElementAttr("thread-pool", "ttl"));
} catch (NumberFormatException nfe) {
Debug.logError("Problems reading value from attribute [ttl] of element [thread-pool] in serviceengine.xml file [" + nfe.toString() + "]. Using default (" + THREAD_TTL + ").", module);
}