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 2015/10/07 07:39:32 UTC
[1/4] camel git commit: CAMEL-9196: Timeout must be a positive value
when calling stop route with a timeout value.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x f880feb6a -> cd7300692
refs/heads/master d42b203c2 -> d406c87f1
CAMEL-9196: Timeout must be a positive value when calling stop route with a timeout value.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/edee114c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/edee114c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/edee114c
Branch: refs/heads/master
Commit: edee114c780423d248a37b631d64ac81db7dee81
Parents: d42b203
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Oct 7 07:15:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 7 07:15:36 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/DefaultShutdownStrategy.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/edee114c/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index 0657f15..2eac21e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -166,6 +166,11 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
protected boolean doShutdown(CamelContext context, List<RouteStartupOrder> routes, long timeout, TimeUnit timeUnit,
boolean suspendOnly, boolean abortAfterTimeout, boolean forceShutdown) throws Exception {
+ // timeout must be a positive value
+ if (timeout <= 0) {
+ throw new IllegalArgumentException("Timeout must be a positive value");
+ }
+
// just return if no routes to shutdown
if (routes.isEmpty()) {
return true;
[4/4] camel git commit: CAMEL-9196: Timeout must be a positive value
when calling stop route with a timeout value.
Posted by da...@apache.org.
CAMEL-9196: Timeout must be a positive value when calling stop route with a timeout value.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd730069
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd730069
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd730069
Branch: refs/heads/camel-2.15.x
Commit: cd7300692da1d72fc3c5c841723f9acf49b62b34
Parents: cd26a65
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Oct 7 07:15:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 7 07:41:28 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/DefaultShutdownStrategy.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd730069/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index eed2235..da2d3f8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -166,6 +166,11 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
protected boolean doShutdown(CamelContext context, List<RouteStartupOrder> routes, long timeout, TimeUnit timeUnit,
boolean suspendOnly, boolean abortAfterTimeout, boolean forceShutdown) throws Exception {
+ // timeout must be a positive value
+ if (timeout <= 0) {
+ throw new IllegalArgumentException("Timeout must be a positive value");
+ }
+
// just return if no routes to shutdown
if (routes.isEmpty()) {
return true;
[3/4] camel git commit: CAMEL-9191: Fixed example. Thanks to Tim for
the patch.
Posted by da...@apache.org.
CAMEL-9191: Fixed example. Thanks to Tim for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd26a651
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd26a651
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd26a651
Branch: refs/heads/camel-2.15.x
Commit: cd26a6513b0a488baf1a4bfb390b9c63e0baab03
Parents: f880feb
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Oct 7 07:17:46 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 7 07:41:20 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/example/server/ServerRoutes.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd26a651/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
index 17ae942..bd491b2 100644
--- a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
+++ b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
@@ -42,7 +42,7 @@ public class ServerRoutes extends RouteBuilder {
//from("jms:queue:numbers").beanRef("multiplier", "multiply");
// the same as above but expressed as a URI configuration
- //from("jms:queue:numbers").to("bean:multiplier?methodName=multiply");
+ //from("jms:queue:numbers").to("bean:multiplier?method=multiply");
}
}
[2/4] camel git commit: CAMEL-9191: Fixed example. Thanks to Tim for
the patch.
Posted by da...@apache.org.
CAMEL-9191: Fixed example. Thanks to Tim for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d406c87f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d406c87f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d406c87f
Branch: refs/heads/master
Commit: d406c87f1c4d1a9144dbae63766c6880936a77fc
Parents: edee114
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Oct 7 07:17:46 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 7 07:17:46 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/example/server/ServerRoutes.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d406c87f/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
index 71813f6..3d80456 100644
--- a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
+++ b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
@@ -42,7 +42,7 @@ public class ServerRoutes extends RouteBuilder {
//from("jms:queue:numbers").bean("multiplier", "multiply");
// the same as above but expressed as a URI configuration
- //from("jms:queue:numbers").to("bean:multiplier?methodName=multiply");
+ //from("jms:queue:numbers").to("bean:multiplier?method=multiply");
}
}