(camel) branch main updated: CAMEL-19770: cleanup catches of Throwable in components

[orpiske]

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 27768f09790 CAMEL-19770: cleanup catches of Throwable in components
27768f09790 is described below

commit 27768f09790f8d239003ec977677cb4292489aee
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Nov 10 11:33:54 2023 +0100

    CAMEL-19770: cleanup catches of Throwable in components
---
 .../main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java   | 2 +-
 .../org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java     | 2 --
 .../main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
 
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index d51de916759..b81fc5df9da 100644
--- 
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ 
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -102,7 +102,7 @@ public class Olingo2Consumer extends 
AbstractApiConsumer<Olingo2ApiName, Olingo2
                 return ApiConsumerHelper.getResultsProcessed(this, result[0], 
isSplitResult());
             }
 
-        } catch (Throwable t) {
+        } catch (Exception t) {
             throw RuntimeCamelException.wrapRuntimeCamelException(t);
         }
     }
diff --git 
a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
 
b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
index 7fe1213df86..720997b045c 100644
--- 
a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
+++ 
b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
@@ -486,8 +486,6 @@ public final class Olingo4AppImpl implements Olingo4App {
             responseHandler.onResponse(this.<T> readContent(uriInfo, content), 
endpointHttpHeaders);
         } catch (Exception e) {
             responseHandler.onException(e);
-        } catch (Error e) {
-            responseHandler.onException(new ODataException("Runtime Error 
Occurred", e));
         }
     }
 
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index 796a88f8878..f31374ddd8b 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -158,7 +158,7 @@ public class TransactionErrorHandler extends 
RedeliveryErrorHandler {
         } catch (TransactionRollbackException e) {
             // do not set as exception, as its just a dummy exception to force 
spring TX to rollback
             logTransactionRollback(redelivered, ids, null, true);
-        } catch (Throwable e) {
+        } catch (Exception e) {
             exchange.setException(e);
             logTransactionRollback(redelivered, ids, e, false);
         } finally {