svn commit: r757340 - in /camel/trunk/components/camel-spring/src: main/java/org/apache/camel/spring/spi/ test/java/org/apache/camel/spring/interceptor/ test/java/org/apache/camel/spring/interceptor/route/

[davsclaus]

Author: davsclaus
Date: Mon Mar 23 07:53:48 2009
New Revision: 757340

URL: http://svn.apache.org/viewvc?rev=757340&view=rev
Log:
Transacted Error Handler is having 0 sec delay as default now instead of 1 sec.

Modified:
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=757340&r1=757339&r2=757340&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
 Mon Mar 23 07:53:48 2009
@@ -37,7 +37,7 @@
 public class TransactionErrorHandlerBuilder extends ErrorHandlerBuilderSupport 
implements Cloneable, InitializingBean {
 
     private TransactionTemplate transactionTemplate;
-    private DelayPolicy delayPolicy = new DelayPolicy();
+    private DelayPolicy delayPolicy;
 
     public TransactionErrorHandlerBuilder() {
     }
@@ -78,6 +78,9 @@
     // 
-------------------------------------------------------------------------
 
     public TransactionErrorHandlerBuilder delay(long delay) {
+        if (getDelayPolicy() == null) {
+            delayPolicy = new DelayPolicy();
+        }
         getDelayPolicy().delay(delay);
         return this;
     }

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java?rev=757340&r1=757339&r2=757340&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
 Mon Mar 23 07:53:48 2009
@@ -109,7 +109,7 @@
                     // transaction error handler instead of the default 
DeadLetterChannel.
                     errorHandler(transactionErrorHandler(required).
                         // notice that the builder has builder methods for 
chained configuration
-                        delay(5 * 1000L));
+                        delay(1 * 1000L));
                 }
                 // END SNIPPET: e1
 

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java?rev=757340&r1=757339&r2=757340&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
 Mon Mar 23 07:53:48 2009
@@ -22,20 +22,15 @@
 public class DataSourceSpringRouteBuilder extends SpringRouteBuilder {
     
     public void configure() throws Exception {
-        
+        // get the required policy
         SpringTransactionPolicy required = bean(SpringTransactionPolicy.class, 
"PROPAGATION_REQUIRED");
 
-        
-        // useTransactionErrorHandler is only used for unit testing to reuse 
code
-        // for doing a 2nd test without this transaction error handler, so 
ignore
-        // this. For spring based transaction, end users are encouraged to use 
the
+        // For spring based transaction, end users are encouraged to use the
         // transaction error handler instead of the default DeadLetterChannel.
         errorHandler(transactionErrorHandler(required).
             // notice that the builder has builder methods for chained 
configuration
-            delay(5 * 1000L));
-        
+            delay(1 * 1000L));
 
-       
         // set the required policy for this route
         from("direct:okay").policy(required).
             setBody(constant("Tiger in Action")).beanRef("bookService").
@@ -45,8 +40,8 @@
         from("direct:fail").policy(required).
             setBody(constant("Tiger in Action")).beanRef("bookService").
             setBody(constant("Donkey in Action")).beanRef("bookService");
-        
     }
+
 }