Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 6 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index aaeea34219..f301082d59 100644
--- a/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.implementation.bpel.ode.provider;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
@@ -56,11 +55,8 @@ import org.w3c.dom.Element;
  * @version $Rev$ $Date$
  */
 public class BPELInvoker implements Invoker {
-    private final static long TIME_OUT = 2000L;
-    
     protected final Log __log = LogFactory.getLog(getClass());
     
-    
     private EmbeddedODEServer odeServer;
     private TransactionManager txMgr;
     
@@ -155,8 +151,7 @@ public class BPELInvoker implements Invoker {
         // Waiting until the reply is ready in case the engine needs to continue in a different thread
         if (onhold != null) {
             try {
-                //add timeout to avoid blocking when there is a exception/failure
-                onhold.get(TIME_OUT, TimeUnit.MILLISECONDS);
+                onhold.get();
             } catch (Exception e) {
                 throw new InvocationTargetException(e,"Error invoking BPEL process : " + e.getMessage());
             }