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 2013/09/14 12:58:55 UTC
[1/4] git commit: Fixed potential NPE
Updated Branches:
refs/heads/camel-2.10.x ee5ca5cdd -> 8170f34e9
refs/heads/camel-2.11.x 4225d51ff -> a6ec08af0
refs/heads/camel-2.12.x d4531f8e2 -> 56d617276
refs/heads/master 0c1b2c53b -> 03af89fe2
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03af89fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03af89fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03af89fe
Branch: refs/heads/master
Commit: 03af89fe232ad524c346262a4a57b173a542e69b
Parents: 0c1b2c5
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:57:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:57:13 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/RedeliveryErrorHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/03af89fe/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 46d4f60..b1a5030 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -910,8 +910,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// and put failure endpoint back as well
exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT));
// and store the route id so we know in which route we failed
- if (exchange.getUnitOfWork().getRouteContext() != null) {
- exchange.setProperty(Exchange.FAILURE_ROUTE_ID, exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId());
}
}
}
[2/4] git commit: Fixed potential NPE
Posted by da...@apache.org.
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56d61727
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56d61727
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56d61727
Branch: refs/heads/camel-2.12.x
Commit: 56d61727699534fb6387cbfb0252432ab992e7c5
Parents: d4531f8
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:57:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:57:39 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/RedeliveryErrorHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/56d61727/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 46d4f60..b1a5030 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -910,8 +910,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// and put failure endpoint back as well
exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT));
// and store the route id so we know in which route we failed
- if (exchange.getUnitOfWork().getRouteContext() != null) {
- exchange.setProperty(Exchange.FAILURE_ROUTE_ID, exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId());
}
}
}
[4/4] git commit: Fixed potential NPE
Posted by da...@apache.org.
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8170f34e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8170f34e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8170f34e
Branch: refs/heads/camel-2.10.x
Commit: 8170f34e9a3a18db30a98a4b80b0d7293bda20b3
Parents: ee5ca5c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:57:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:58:12 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/RedeliveryErrorHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8170f34e/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 63fbe2a..dddb6e1 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -844,8 +844,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// and put failure endpoint back as well
exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT));
// and store the route id so we know in which route we failed
- if (exchange.getUnitOfWork().getRouteContext() != null) {
- exchange.setProperty(Exchange.FAILURE_ROUTE_ID, exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId());
}
}
}
[3/4] git commit: Fixed potential NPE
Posted by da...@apache.org.
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6ec08af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6ec08af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6ec08af
Branch: refs/heads/camel-2.11.x
Commit: a6ec08af0c08e51aaaa31f49cfc09f64884eaa66
Parents: 4225d51
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:57:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:57:52 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/RedeliveryErrorHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a6ec08af/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index f34b467..57bf1f2 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -899,8 +899,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// and put failure endpoint back as well
exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT));
// and store the route id so we know in which route we failed
- if (exchange.getUnitOfWork().getRouteContext() != null) {
- exchange.setProperty(Exchange.FAILURE_ROUTE_ID, exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId());
}
}
}