camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: Upgrade hystrix
Date Thu, 05 May 2016 06:50:34 GMT
Upgrade hystrix


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0f1b50f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0f1b50f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0f1b50f

Branch: refs/heads/master
Commit: a0f1b50f4864ea4065e14d2ccd9544be2aec00ae
Parents: 73bb498
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu May 5 08:50:00 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu May 5 08:50:24 2016 +0200

----------------------------------------------------------------------
 .../hystrix/HystrixComponentCircuitBreakerTest.java          | 8 +++++---
 parent/pom.xml                                               | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a0f1b50f/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixComponentCircuitBreakerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixComponentCircuitBreakerTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixComponentCircuitBreakerTest.java
index 7e781a1..d0e33ec 100644
--- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixComponentCircuitBreakerTest.java
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixComponentCircuitBreakerTest.java
@@ -26,7 +26,7 @@ public class HystrixComponentCircuitBreakerTest extends HystrixComponentBase
{
     @Test
     public void circuitBreakerRejectsWhenTresholdReached() throws Exception {
         final int requestCount = 5;
-        resultEndpoint.expectedMessageCount(2);
+        resultEndpoint.expectedMessageCount(3);
         errorEndpoint.expectedMessageCount(requestCount);
         resultEndpoint.whenAnyExchangeReceived(new Processor() {
             @Override
@@ -37,9 +37,9 @@ public class HystrixComponentCircuitBreakerTest extends HystrixComponentBase
{
 
         for (int i = 0; i < requestCount; i++) {
             try {
-                template.sendBody("test");
+                template.sendBody("test" + i);
             } catch (Exception e) {
-
+                // ignore
             }
         }
         assertMockEndpointsSatisfied();
@@ -52,6 +52,7 @@ public class HystrixComponentCircuitBreakerTest extends HystrixComponentBase
{
             public void configure() {
 
                 from("direct:fallback")
+                        .to("log:fallback")
                         .to("mock:error");
 
                 from("direct:run")
@@ -61,6 +62,7 @@ public class HystrixComponentCircuitBreakerTest extends HystrixComponentBase
{
                                 Thread.sleep(500);
                             }
                         })
+                        .to("log:result")
                         .to("mock:result");
 
                 from("direct:start")

http://git-wip-us.apache.org/repos/asf/camel/blob/a0f1b50f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a433355..e7841df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -242,8 +242,8 @@
     <httpclient4-olingo2-version>4.4.1</httpclient4-olingo2-version>
     <httpasyncclient-version>4.1.1</httpasyncclient-version>
     <httpclient-version>3.1</httpclient-version>
-    <hystrix-version>1.4.26</hystrix-version>
-    <hystrix-bundle-version>1.4.23_1</hystrix-bundle-version>
+    <hystrix-version>1.5.2</hystrix-version>
+    <hystrix-bundle-version>1.5.2_1</hystrix-bundle-version>
     <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
     <ibatis-version>2.3.4.726</ibatis-version>
     <ical4j-version>1.0.7</ical4j-version>


Mime
View raw message