You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2008/06/23 20:44:00 UTC
svn commit: r670706 - in
/servicemix/components/engines/servicemix-eip/trunk: ./
src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
Author: chirino
Date: Mon Jun 23 11:43:59 2008
New Revision: 670706
URL: http://svn.apache.org/viewvc?rev=670706&view=rev
Log:
Merged revisions 670558 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx3/trunk/deployables/serviceengines/servicemix-eip
........
r670558 | kkoehler | 2008-06-23 09:21:07 -0400 (Mon, 23 Jun 2008) | 3 lines
patch for SM-1417. "A failing EIPTransactionalTest causes some more tests to fail..."
added simple try/finally block
........
Modified:
servicemix/components/engines/servicemix-eip/trunk/ (props changed)
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
Propchange: servicemix/components/engines/servicemix-eip/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 23 11:43:59 2008
@@ -1 +1 @@
-/servicemix/smx3/trunk/deployables/serviceengines/servicemix-eip:1-669606
+/servicemix/smx3/trunk/deployables/serviceengines/servicemix-eip:1-670705
Modified: servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java?rev=670706&r1=670705&r2=670706&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java Mon Jun 23 11:43:59 2008
@@ -83,9 +83,12 @@
}
protected void tearDown() throws Exception {
- listener.assertExchangeCompleted();
- jbi.shutDown();
- broker.stop();
+ try {
+ listener.assertExchangeCompleted();
+ } finally {
+ jbi.shutDown();
+ broker.stop();
+ }
}
protected void configurePattern(EIPEndpoint endpoint) {