Author: assaf
Date: Wed Sep  6 08:50:27 2006
New Revision: 440741

URL: http://svn.apache.org/viewvc?view=rev&rev=440741
Log: (empty)

Added:
    incubator/ode/trunk/bpel-runtime/lib/
    incubator/ode/trunk/bpel-runtime/lib/maven-artifact-ant-2.0.4-dep.jar   
(with props)
Modified:
    
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java

Added: incubator/ode/trunk/bpel-runtime/lib/maven-artifact-ant-2.0.4-dep.jar
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/lib/maven-artifact-ant-2.0.4-dep.jar?view=auto&rev=440741
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/ode/trunk/bpel-runtime/lib/maven-artifact-ant-2.0.4-dep.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Modified: 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java?view=diff&rev=440741&r1=440740&r2=440741
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
 Wed Sep  6 08:50:27 2006
@@ -123,17 +123,10 @@
       request.setMessage(body);
       mex.invoke(request);
       mex.complete();
+      _txManager.commit();
     } catch (Exception except) {
-      if (_txManager != null) {
-        _txManager.rollback();
-        _txManager = null;
-      }
+      _txManager.rollback();
       throw except;
-    } finally {
-      if (_txManager != null) {
-        _txManager.commit();
-        _txManager = null;
-      }
     }
 /*
         // Preparing a callback just in case we would need one.
@@ -159,18 +152,10 @@
   }
 
   public void shutdown() throws Exception {
-    if (_server != null) {
-      _server.stop();
-      _server = null;
-    }
-    if (_scheduler != null) {
-      _scheduler.shutdown();
-      _scheduler = null;
-    }
-    if (_jotm != null) {
-      _jotm.stop();
-      _jotm = null;
-    }
+    _server.stop();
+    _scheduler.stop();
+    _scheduler.shutdown();
+    _jotm.stop();
   }
 
   protected TransactionManager createTransactionManager() throws Exception {


Reply via email to