You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/08/17 13:14:48 UTC
[camel] branch main updated: CAMEL-19748: fixed catching Throwables in camel-core (#11139)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5fedfd1fc3d CAMEL-19748: fixed catching Throwables in camel-core (#11139)
5fedfd1fc3d is described below
commit 5fedfd1fc3ded28de95640da9c982773789b2512
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Aug 17 15:14:42 2023 +0200
CAMEL-19748: fixed catching Throwables in camel-core (#11139)
- fixed catching Throwables in camel-base
- fixed catching Throwables in camel-core-model
- fixed catching Throwables in camel-core-engine
- fixed catching Throwables in camel-core
- fixed catching Throwables in camel-management
- fixed catching Throwables in camel-yaml-io
- fixed catching Throwables in camel-core-catalog
---
.../apache/camel/impl/converter/AnnotationTypeConverterLoader.java | 2 +-
.../org/apache/camel/impl/converter/BaseTypeConverterRegistry.java | 2 +-
.../main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 4 ++--
.../src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc | 2 +-
.../src/main/java/org/apache/camel/builder/AdviceWith.java | 4 ++--
.../test/java/org/apache/camel/processor/CustomLoadBalanceTest.java | 2 +-
.../org/apache/camel/processor/IdempotentConsumerConcurrentTest.java | 2 +-
.../org/apache/camel/management/mbean/ManagedBacklogDebugger.java | 2 +-
.../main/java/org/apache/camel/yaml/io/ModelJSonSchemaResolver.java | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 96f950d0d2b..c4bcac407a8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -184,7 +184,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
// class found, so no need to load it with another class loader
}
break;
- } catch (Throwable e) {
+ } catch (Exception e) {
// do nothing here
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 6b2fec49763..aa58325cec6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -147,7 +147,7 @@ public abstract class BaseTypeConverterRegistry extends CoreTypeConverterRegistr
for (ClassLoader loader : getResolver().getClassLoaders()) {
try {
clazz = loader.loadClass(name);
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore
}
if (clazz != null) {
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index b9f903a0905..f808d6bad47 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -1346,7 +1346,7 @@ public abstract class AbstractCamelCatalog {
int index = (int) result;
answer.setIndex(index);
}
- } catch (Throwable i) {
+ } catch (Exception i) {
// ignore
}
}
@@ -1360,7 +1360,7 @@ public abstract class AbstractCamelCatalog {
String msg = (String) result;
answer.setShortError(msg);
}
- } catch (Throwable i) {
+ } catch (Exception i) {
// ignore
}
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
index 17cec1bc391..c5b39894929 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
@@ -71,7 +71,7 @@ public static class MyLoadBalancer extends LoadBalancerSupport {
} else {
getProcessors().get(2).process(exchange);
}
- } catch (Throwable e) {
+ } catch (Exception e) {
exchange.setException(e);
}
callback.done(true);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
index 8ec466c11e1..63ddec47054 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
@@ -243,7 +243,7 @@ public final class AdviceWith {
if (logRoutesAsXml && LOG.isInfoEnabled()) {
try {
beforeAsXml = modelToXMLDumper.dumpModelAsXml(camelContext, definition);
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore, it may be due jaxb is not on classpath etc
}
}
@@ -280,7 +280,7 @@ public final class AdviceWith {
try {
String afterAsXml = modelToXMLDumper.dumpModelAsXml(camelContext, merged);
LOG.info("Adviced route before/after as XML:\n{}\n\n{}", beforeAsXml, afterAsXml);
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore, it may be due jaxb is not on classpath etc
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomLoadBalanceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomLoadBalanceTest.java
index 9d2ab5000d2..1c79a6b90cc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomLoadBalanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomLoadBalanceTest.java
@@ -85,7 +85,7 @@ public class CustomLoadBalanceTest extends ContextTestSupport {
} else {
getProcessors().get(2).process(exchange);
}
- } catch (Throwable e) {
+ } catch (Exception e) {
exchange.setException(e);
}
callback.done(true);
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
index 7a6080ed4a5..843f5b9f5d7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
@@ -169,7 +169,7 @@ public class IdempotentConsumerConcurrentTest extends ContextTestSupport {
for (int j = 0; j < loopCount; j++) {
sendMessage(String.valueOf(j), "multithreadedTest" + j);
}
- } catch (Throwable e) {
+ } catch (Exception e) {
LOG.error("Failed to send message: {}", e.getMessage(), e);
failedFlag[0] = true;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
index 3eb6f0793b6..b1e2e08cc53 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
@@ -460,7 +460,7 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
// must always xml encode
sb.append(StringHelper.xmlEncode(xml));
}
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore as the body is for logging purpose
}
}
diff --git a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/ModelJSonSchemaResolver.java b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/ModelJSonSchemaResolver.java
index 46187cfc463..d9c2e6c0bf4 100644
--- a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/ModelJSonSchemaResolver.java
+++ b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/ModelJSonSchemaResolver.java
@@ -67,7 +67,7 @@ class ModelJSonSchemaResolver implements JSonSchemaResolver {
return inputStream;
}
}
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore
}
return null;