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 2017/04/12 19:01:03 UTC
[1/6] camel git commit: [CAMEL-11139] ClassNotFoundException may
silently be ignored in InProducer
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x bd221e8b8 -> 96fc48c3e
refs/heads/camel-2.18.x bb68f9659 -> 33dd5eb61
refs/heads/master df1cda698 -> 67ab9a972
[CAMEL-11139] ClassNotFoundException may silently be ignored in InProducer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6cdc99b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6cdc99b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6cdc99b
Branch: refs/heads/master
Commit: d6cdc99b5fa79e03fdf79d9b3e98858399c7be79
Parents: df1cda6
Author: Thomas Diesler <th...@jboss.com>
Authored: Wed Apr 12 14:43:39 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:54:22 2017 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d6cdc99b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 1062029..bfd20f0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -504,7 +504,7 @@ public class ProducerCache extends ServiceSupport {
// lets populate using the processor callback
try {
processor.process(exchange);
- } catch (Exception e) {
+ } catch (Throwable e) {
// populate failed so return
exchange.setException(e);
return exchange;
[2/6] camel git commit: CAMEL-11139: Catch throwable in other places
and also in the consumer cache
Posted by da...@apache.org.
CAMEL-11139: Catch throwable in other places and also in the consumer cache
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67ab9a97
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67ab9a97
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67ab9a97
Branch: refs/heads/master
Commit: 67ab9a97250909e7ba7a3081d9f506ad22702248
Parents: d6cdc99
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 20:57:41 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:57:41 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/ConsumerCache.java | 4 ++--
.../src/main/java/org/apache/camel/impl/ProducerCache.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/67ab9a97/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
index 20deb90..4cb8ef4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
@@ -145,7 +145,7 @@ public class ConsumerCache extends ServiceSupport {
LOG.debug("Released PollingConsumer: {} is stopped as consumer cache is full", endpoint);
}
ServiceHelper.stopAndShutdownService(pollingConsumer);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
if (ex instanceof RuntimeCamelException) {
throw (RuntimeCamelException)ex;
} else {
@@ -171,7 +171,7 @@ public class ConsumerCache extends ServiceSupport {
try {
answer = endpoint.createPollingConsumer();
answer.start();
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateConsumerException(endpoint, e);
}
if (pooled && answer instanceof ServicePoolAware) {
http://git-wip-us.apache.org/repos/asf/camel/blob/67ab9a97/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index bfd20f0..faa0f72 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -320,7 +320,7 @@ public class ProducerCache extends ServiceSupport {
doneSync -> asyncDispatchExchange(endpoint, producer, resultProcessor,
finalExchange, producerCallback));
return false;
- } catch (Exception e) {
+ } catch (Throwable e) {
// populate failed so return
innerExchange.setException(e);
producerCallback.done(true);
@@ -575,7 +575,7 @@ public class ProducerCache extends ServiceSupport {
// add as service which will also start the service
// (false => we and handling the lifecycle of the producer in this cache)
getCamelContext().addService(answer, false);
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateProducerException(endpoint, e);
}
[4/6] camel git commit: CAMEL-11139: Catch throwable in other places
and also in the consumer cache
Posted by da...@apache.org.
CAMEL-11139: Catch throwable in other places and also in the consumer cache
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33dd5eb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33dd5eb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33dd5eb6
Branch: refs/heads/camel-2.18.x
Commit: 33dd5eb611fdd0bb4aad6e32433f231b5394f317
Parents: c52bca5
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 20:57:41 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:58:27 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/ConsumerCache.java | 4 ++--
.../src/main/java/org/apache/camel/impl/ProducerCache.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/33dd5eb6/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
index 20deb90..4cb8ef4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
@@ -145,7 +145,7 @@ public class ConsumerCache extends ServiceSupport {
LOG.debug("Released PollingConsumer: {} is stopped as consumer cache is full", endpoint);
}
ServiceHelper.stopAndShutdownService(pollingConsumer);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
if (ex instanceof RuntimeCamelException) {
throw (RuntimeCamelException)ex;
} else {
@@ -171,7 +171,7 @@ public class ConsumerCache extends ServiceSupport {
try {
answer = endpoint.createPollingConsumer();
answer.start();
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateConsumerException(endpoint, e);
}
if (pooled && answer instanceof ServicePoolAware) {
http://git-wip-us.apache.org/repos/asf/camel/blob/33dd5eb6/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index bfd20f0..faa0f72 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -320,7 +320,7 @@ public class ProducerCache extends ServiceSupport {
doneSync -> asyncDispatchExchange(endpoint, producer, resultProcessor,
finalExchange, producerCallback));
return false;
- } catch (Exception e) {
+ } catch (Throwable e) {
// populate failed so return
innerExchange.setException(e);
producerCallback.done(true);
@@ -575,7 +575,7 @@ public class ProducerCache extends ServiceSupport {
// add as service which will also start the service
// (false => we and handling the lifecycle of the producer in this cache)
getCamelContext().addService(answer, false);
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateProducerException(endpoint, e);
}
[3/6] camel git commit: [CAMEL-11139] ClassNotFoundException may
silently be ignored in InProducer
Posted by da...@apache.org.
[CAMEL-11139] ClassNotFoundException may silently be ignored in InProducer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c52bca5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c52bca5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c52bca5e
Branch: refs/heads/camel-2.18.x
Commit: c52bca5e1b7c0ba7c9f1b8ec8ba22d05ad8dcc40
Parents: bb68f96
Author: Thomas Diesler <th...@jboss.com>
Authored: Wed Apr 12 14:43:39 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:58:20 2017 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c52bca5e/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 1062029..bfd20f0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -504,7 +504,7 @@ public class ProducerCache extends ServiceSupport {
// lets populate using the processor callback
try {
processor.process(exchange);
- } catch (Exception e) {
+ } catch (Throwable e) {
// populate failed so return
exchange.setException(e);
return exchange;
[5/6] camel git commit: [CAMEL-11139] ClassNotFoundException may
silently be ignored in InProducer
Posted by da...@apache.org.
[CAMEL-11139] ClassNotFoundException may silently be ignored in InProducer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c05d7763
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c05d7763
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c05d7763
Branch: refs/heads/camel-2.17.x
Commit: c05d77633b1b1cc7720636011e66801c242bd93a
Parents: bd221e8
Author: Thomas Diesler <th...@jboss.com>
Authored: Wed Apr 12 14:43:39 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:58:46 2017 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c05d7763/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 9be2825..3a45e3e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -387,7 +387,7 @@ public class ProducerCache extends ServiceSupport {
// lets populate using the processor callback
try {
processor.process(exchange);
- } catch (Exception e) {
+ } catch (Throwable e) {
// populate failed so return
exchange.setException(e);
return exchange;
[6/6] camel git commit: CAMEL-11139: Catch throwable in other places
and also in the consumer cache
Posted by da...@apache.org.
CAMEL-11139: Catch throwable in other places and also in the consumer cache
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/96fc48c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/96fc48c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/96fc48c3
Branch: refs/heads/camel-2.17.x
Commit: 96fc48c3ecce31843f1b47b9fef413a661349052
Parents: c05d776
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 20:57:41 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 20:59:55 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/ConsumerCache.java | 4 ++--
.../src/main/java/org/apache/camel/impl/ProducerCache.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/96fc48c3/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
index 52e227f..87244f0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
@@ -145,7 +145,7 @@ public class ConsumerCache extends ServiceSupport {
LOG.debug("Released PollingConsumer: {} is stopped as consumer cache is full", endpoint);
}
ServiceHelper.stopAndShutdownService(pollingConsumer);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
if (ex instanceof RuntimeCamelException) {
throw (RuntimeCamelException)ex;
} else {
@@ -171,7 +171,7 @@ public class ConsumerCache extends ServiceSupport {
try {
answer = endpoint.createPollingConsumer();
answer.start();
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateConsumerException(endpoint, e);
}
if (pooled && answer instanceof ServicePoolAware) {
http://git-wip-us.apache.org/repos/asf/camel/blob/96fc48c3/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 3a45e3e..00936c2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -440,7 +440,7 @@ public class ProducerCache extends ServiceSupport {
// add as service which will also start the service
// (false => we and handling the lifecycle of the producer in this cache)
getCamelContext().addService(answer, false);
- } catch (Exception e) {
+ } catch (Throwable e) {
throw new FailedToCreateProducerException(endpoint, e);
}