You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/04/13 13:14:58 UTC
svn commit: r933553 - in /camel/trunk/components/camel-spring/src:
main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
Author: davsclaus
Date: Tue Apr 13 11:14:58 2010
New Revision: 933553
URL: http://svn.apache.org/viewvc?rev=933553&view=rev
Log:
CAMEL-2637: Fixed errorHandler tag in Spring XML to not work properly with fallback.
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java?rev=933553&r1=933552&r2=933553&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java Tue Apr 13 11:14:58 2010
@@ -113,7 +113,7 @@ public class ErrorHandlerDefinitionParse
}
}
- private final class RedeliveryPolicyDefinitionParser extends BeanDefinitionParser {
+ protected class RedeliveryPolicyDefinitionParser extends BeanDefinitionParser {
public RedeliveryPolicyDefinitionParser(Class type) {
super(type);
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java?rev=933553&r1=933552&r2=933553&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java Tue Apr 13 11:14:58 2010
@@ -16,8 +16,6 @@
*/
package org.apache.camel.spring.config;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,25 +29,4 @@ public class SpringErrorHandlerConfigFal
return new ClassPathXmlApplicationContext("org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.xml");
}
- public void testDefaultEH() throws Exception {
- // TODO: delete me when working
-
- getMockEndpoint("mock:result").expectedMessageCount(0);
- getMockEndpoint("mock:dlc").expectedMessageCount(0);
-
- Exchange exchange = template.send("direct:start", new Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setBody("Damn");
- }
- });
-
- assertMockEndpointsSatisfied();
-
- assertTrue(exchange.isFailed());
- assertEquals("Damn cannot do this", exchange.getException(IllegalArgumentException.class).getMessage());
- assertEquals(true, exchange.getIn().getHeader(Exchange.REDELIVERED));
- assertEquals(2, exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER));
- }
-
-
}