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/23 10:53:18 UTC
[camel] branch main updated: CAMEL-19770: fixed catching Throwable in components (#11183)
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 bc76713c621 CAMEL-19770: fixed catching Throwable in components (#11183)
bc76713c621 is described below
commit bc76713c621734a82c04964369b018a2958d8be8
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Wed Aug 23 12:53:12 2023 +0200
CAMEL-19770: fixed catching Throwable in components (#11183)
* camel-box
* camel-crypto
* camel-cxf
* camel-dns
* camel-fop
* camel-hdfs
* camel-jmx
---
.../java/org/apache/camel/component/box/AbstractBoxITSupport.java | 4 ++--
.../test/java/org/apache/camel/component/box/BoxFilesManagerIT.java | 6 +++---
.../java/org/apache/camel/component/box/BoxFoldersManagerIT.java | 2 +-
.../java/org/apache/camel/component/box/BoxGroupsManagerIT.java | 4 ++--
.../test/java/org/apache/camel/component/box/BoxTasksManagerIT.java | 6 +++---
.../java/org/apache/camel/component/crypto/ECDSASignatureTest.java | 2 +-
.../component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java | 2 +-
.../org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java | 2 +-
.../org/apache/camel/component/dns/DnsIpEndpointSpringTest.java | 4 ++--
.../test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java | 4 ++--
.../org/apache/camel/component/dns/DnsIpHeaderTransferTest.java | 4 ++--
.../org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java | 4 ++--
.../java/org/apache/camel/component/dns/DnsLookupEndpointTest.java | 4 ++--
.../test/java/org/apache/camel/component/fop/FopComponentTest.java | 2 +-
.../test/java/org/apache/camel/component/fop/FopEndpointTest.java | 2 +-
.../test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java | 2 +-
.../src/test/java/org/apache/camel/component/jmx/XmlFixture.java | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java
index 1e6ce060a11..de57a7fad79 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java
@@ -102,7 +102,7 @@ public class AbstractBoxITSupport extends CamelTestSupport {
protected void deleteTestFolder() {
try {
testFolder.delete(true);
- } catch (Throwable t) {
+ } catch (Exception t) {
}
testFolder = null;
}
@@ -110,7 +110,7 @@ public class AbstractBoxITSupport extends CamelTestSupport {
protected void deleteTestFile() {
try {
testFile.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
testFile = null;
}
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
index 4866cfd4b11..6439111d04f 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
@@ -419,7 +419,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
@@ -448,7 +448,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
@@ -479,7 +479,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
index 19f4f411c31..498219090e5 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
@@ -119,7 +119,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete(true);
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
index a02a459babf..a4d5d36f75a 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
@@ -87,7 +87,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
@@ -261,7 +261,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
if (testGroup != null) {
try {
testGroup.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
testGroup = null;
}
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
index e31c202ff0a..5e3a5bc151b 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
@@ -103,7 +103,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
result.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
@@ -156,7 +156,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
if (result != null) {
try {
((BoxTaskAssignment) result.getResource()).delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
}
}
@@ -273,7 +273,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
private void deleteTestTask() {
try {
testTask.delete();
- } catch (Throwable t) {
+ } catch (Exception t) {
}
testTask = null;
}
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 208a889079d..749e3a1830f 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -62,7 +62,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
keyStore.load(in, "security".toCharArray());
privateKey = (PrivateKey) keyStore.getKey("ECDSA", "security".toCharArray());
x509 = (X509Certificate) keyStore.getCertificate("ECDSA");
- } catch (Throwable e) {
+ } catch (Exception e) {
LOG.warn("Cannot setup keystore for running this test due {}. This test is skipped.", e.getMessage(), e);
canRun = false;
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java
index c7b07f13d50..53cb5e21992 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java
@@ -73,7 +73,7 @@ public class JaxWsWebFaultAnnotationToFaultTest extends CamelTestSupport {
fail("Expect to get an exception here");
} catch (PingMeFault expected) {
assertEquals(MESSAGE, expected.getMessage());
- } catch (Throwable t) {
+ } catch (Exception t) {
LOG.warn("The CXF client did not manage to map the client exception: {}", t.getMessage(), t);
fail("The CXF client did not manage to map the client exception "
+ t.getClass().getName() + " to a " + PingMeFault.class.getName()
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java
index ddd9a35de09..2e91868a380 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java
@@ -50,7 +50,7 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
try {
Object o = map.getClass().getMethod("getAction").invoke(map);
return (String) o.getClass().getMethod("getValue").invoke(o);
- } catch (Throwable t) {
+ } catch (Exception t) {
throw new Fault(t);
}
}
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
index a88f2c6f13f..93f88f62f17 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
@@ -46,7 +46,7 @@ public class DnsIpEndpointSpringTest extends CamelSpringTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", null);
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
@@ -58,7 +58,7 @@ public class DnsIpEndpointSpringTest extends CamelSpringTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", "");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
index a6bfa7240ed..91a2c0eba20 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
@@ -55,7 +55,7 @@ public class DnsIpEndpointTest extends CamelTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", null);
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
@@ -67,7 +67,7 @@ public class DnsIpEndpointTest extends CamelTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", "");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
index a52d8ad7d82..da712b107db 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
@@ -53,7 +53,7 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", null);
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
@@ -66,7 +66,7 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.domain", "");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
index 50fec62d3be..8e88cab02d9 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
@@ -52,7 +52,7 @@ public class DnsLookupEndpointSpringTest extends CamelSpringTestSupport {
try {
template.sendBody("hello");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
@@ -64,7 +64,7 @@ public class DnsLookupEndpointSpringTest extends CamelSpringTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.name", "");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException, t.toString());
}
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
index f0042bcabde..fd21dae4279 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
@@ -61,7 +61,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
try {
template.sendBody("hello");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException);
}
resultEndpoint.assertIsSatisfied();
@@ -73,7 +73,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
try {
template.sendBodyAndHeader("hello", "dns.name", "");
fail("Should have thrown exception");
- } catch (Throwable t) {
+ } catch (Exception t) {
assertTrue(t.getCause() instanceof IllegalArgumentException, t.toString());
}
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
index 7814aa9a55c..d3ebf31f8a4 100644
--- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
+++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
@@ -51,7 +51,7 @@ public class FopComponentTest extends CamelTestSupport {
try {
super.setUp();
- } catch (Throwable e) {
+ } catch (Exception e) {
canTest = false;
}
}
diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
index 6d4a6c95a68..b57b0670252 100644
--- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
+++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
@@ -36,7 +36,7 @@ public class FopEndpointTest extends CamelTestSupport {
private boolean canTest() {
try {
context().getEndpoint("fop:pdf");
- } catch (Throwable e) {
+ } catch (Exception e) {
return false;
}
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
index dc54d1afe5e..ef4870b9c52 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
@@ -45,7 +45,7 @@ public abstract class HdfsTestSupport extends CamelTestSupport {
try {
String hadoopHome = Shell.getHadoopHome();
hasLocalHadoop = StringUtils.isNotEmpty(hadoopHome);
- } catch (Throwable e) {
+ } catch (Exception e) {
hasLocalHadoop = false;
}
assumeTrue(hasLocalHadoop, "Missing local hadoop configuration");
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
index f6099341364..8ae7c726002 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
@@ -51,7 +51,7 @@ public final class XmlFixture {
.checkForSimilar().build();
try {
assertFalse(diff.hasDifferences(), aMessage + ":\n" + diff.toString());
- } catch (Throwable t) {
+ } catch (Exception t) {
dump(aActual);
throw t;
}