svn commit: r769399 - /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java

[davsclaus]

Author: davsclaus
Date: Tue Apr 28 13:40:03 2009
New Revision: 769399

URL: http://svn.apache.org/viewvc?rev=769399&view=rev
Log:
Fixed broken unit test that hangs.

Modified:
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java?rev=769399&r1=769398&r2=769399&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
 Tue Apr 28 13:40:03 2009
@@ -17,6 +17,7 @@
 package org.apache.camel.component.jms.tx;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Channel;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
@@ -91,7 +92,9 @@
         while (true) {
             processor = unwrapDeadLetter(processor);
 
-            if (processor instanceof DelegateAsyncProcessor) {
+            if (processor instanceof Channel) {
+                processor = ((Channel)processor).getNextProcessor();
+            } else if (processor instanceof DelegateAsyncProcessor) {
                 processor = ((DelegateAsyncProcessor)processor).getProcessor();
             } else if (processor instanceof DelegateProcessor) {
                 // TransactionInterceptor is a DelegateProcessor
@@ -112,7 +115,9 @@
 
     private Processor unwrapDeadLetter(Processor processor) {
         while (true) {
-            if (processor instanceof DeadLetterChannel) {
+            if (processor instanceof Channel) {
+                processor = ((Channel)processor).getNextProcessor();
+            } else if (processor instanceof DeadLetterChannel) {
                 processor = ((DeadLetterChannel)processor).getOutput();
             } else if (processor instanceof DefaultErrorHandler) {
                 processor = ((DefaultErrorHandler)processor).getOutput();