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 2014/09/26 17:54:38 UTC

[1/3] git commit: Improve Exception handling in SJMS: Changed Logger calls to include the caught exception as well, so that stacktraces are no longer swallowed. Same for wrapping exceptions.

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 720d8e4ff -> 96f9ab895
  refs/heads/master 6a8cd4160 -> 61f9e83b4


Improve Exception handling in SJMS:
Changed Logger calls to include the caught exception as well, so that
stacktraces are no longer swallowed. Same for wrapping exceptions.

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14199722
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14199722
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14199722

Branch: refs/heads/master
Commit: 14199722e1626d383c4b8ea671d08c63d0582e14
Parents: 40bd0d6
Author: Steffen Ryll <sr...@users.noreply.github.com>
Authored: Thu Sep 25 10:49:22 2014 +0200
Committer: Steffen Ryll <sr...@users.noreply.github.com>
Committed: Thu Sep 25 10:57:15 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/component/sjms/jms/JmsMessageHelper.java | 10 +++-------
 .../camel/component/sjms/producer/InOnlyProducer.java     |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/14199722/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index 35b7382..3c83585 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -139,7 +139,7 @@ public final class JmsMessageHelper {
                 break;
             }
         } catch (Exception e) {
-            LOGGER.error("Error creating a message of type: " + messageType.toString());
+            LOGGER.error("Error creating a message of type: {}", messageType, e);
             throw e;
         }
         if (messageHeaders != null && !messageHeaders.isEmpty()) {
@@ -317,9 +317,7 @@ public final class JmsMessageHelper {
         try {
             message.setJMSType(type);
         } catch (JMSException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Error setting the message type: {}", type);
-            }
+            LOGGER.debug("Error setting the message type: {}", type, e);
         }
     }
 
@@ -335,9 +333,7 @@ public final class JmsMessageHelper {
         try {
             message.setJMSCorrelationID(correlationId);
         } catch (JMSException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Error setting the correlationId: {}", correlationId);
-            }
+            LOGGER.debug("Error setting the correlationId: {}", correlationId, e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/14199722/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index 3dac038..35ef352 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -74,7 +74,7 @@ public class InOnlyProducer extends SjmsProducer {
 
             answer = new MessageProducerResources(session, messageProducer, commitStrategy);
         } catch (Exception e) {
-            log.error("Unable to create the MessageProducer: " + e.getLocalizedMessage());
+            log.error("Unable to create the MessageProducer", e);
         } finally {
             if (conn != null) {
                 getConnectionResource().returnConnection(conn);
@@ -123,7 +123,7 @@ public class InOnlyProducer extends SjmsProducer {
                 producer.getMessageProducer().send(message);
             }
         } catch (Exception e) {
-            exchange.setException(new Exception("Unable to complete sending the message: " + e.getLocalizedMessage()));
+            exchange.setException(new Exception("Unable to complete sending the message: ", e));
         } finally {
             if (producer != null) {
                 getProducers().returnObject(producer);


[2/3] git commit: Merge branch 'sjms-improve-exception-logging' of https://github.com/sryll/camel

Posted by da...@apache.org.
Merge branch 'sjms-improve-exception-logging' of https://github.com/sryll/camel


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61f9e83b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61f9e83b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61f9e83b

Branch: refs/heads/master
Commit: 61f9e83b4fb629276905539407458434ca069e4b
Parents: 6a8cd41 1419972
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 26 17:54:06 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 26 17:54:06 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/component/sjms/jms/JmsMessageHelper.java | 10 +++-------
 .../camel/component/sjms/producer/InOnlyProducer.java     |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[3/3] git commit: Improve Exception handling in SJMS: Changed Logger calls to include the caught exception as well, so that stacktraces are no longer swallowed. Same for wrapping exceptions.

Posted by da...@apache.org.
Improve Exception handling in SJMS:
Changed Logger calls to include the caught exception as well, so that
stacktraces are no longer swallowed. Same for wrapping exceptions.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/96f9ab89
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/96f9ab89
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/96f9ab89

Branch: refs/heads/camel-2.14.x
Commit: 96f9ab895f4d53290ae591756f2182fe451cc69d
Parents: 720d8e4
Author: Steffen Ryll <sr...@users.noreply.github.com>
Authored: Thu Sep 25 10:49:22 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 26 17:54:25 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/component/sjms/jms/JmsMessageHelper.java | 10 +++-------
 .../camel/component/sjms/producer/InOnlyProducer.java     |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/96f9ab89/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index 35b7382..3c83585 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -139,7 +139,7 @@ public final class JmsMessageHelper {
                 break;
             }
         } catch (Exception e) {
-            LOGGER.error("Error creating a message of type: " + messageType.toString());
+            LOGGER.error("Error creating a message of type: {}", messageType, e);
             throw e;
         }
         if (messageHeaders != null && !messageHeaders.isEmpty()) {
@@ -317,9 +317,7 @@ public final class JmsMessageHelper {
         try {
             message.setJMSType(type);
         } catch (JMSException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Error setting the message type: {}", type);
-            }
+            LOGGER.debug("Error setting the message type: {}", type, e);
         }
     }
 
@@ -335,9 +333,7 @@ public final class JmsMessageHelper {
         try {
             message.setJMSCorrelationID(correlationId);
         } catch (JMSException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Error setting the correlationId: {}", correlationId);
-            }
+            LOGGER.debug("Error setting the correlationId: {}", correlationId, e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/96f9ab89/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index 3dac038..35ef352 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -74,7 +74,7 @@ public class InOnlyProducer extends SjmsProducer {
 
             answer = new MessageProducerResources(session, messageProducer, commitStrategy);
         } catch (Exception e) {
-            log.error("Unable to create the MessageProducer: " + e.getLocalizedMessage());
+            log.error("Unable to create the MessageProducer", e);
         } finally {
             if (conn != null) {
                 getConnectionResource().returnConnection(conn);
@@ -123,7 +123,7 @@ public class InOnlyProducer extends SjmsProducer {
                 producer.getMessageProducer().send(message);
             }
         } catch (Exception e) {
-            exchange.setException(new Exception("Unable to complete sending the message: " + e.getLocalizedMessage()));
+            exchange.setException(new Exception("Unable to complete sending the message: ", e));
         } finally {
             if (producer != null) {
                 getProducers().returnObject(producer);