[2/4] cxf git commit: [CXF-6672] Catch trhowable instead of exception to grab errors as well

2017-03-24 Thread dkulp 
[CXF-6672] Catch trhowable instead of exception to grab errors as well

# Conflicts:
#   
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java


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

Branch: refs/heads/3.0.x-fixes
Commit: c0b598360c9bc192f0b9e6a38f6a5846a3c71614
Parents: acf9e1a
Author: Daniel Kulp 
Authored: Thu Mar 23 14:12:29 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:51:06 2017 -0400

--
 .../transport/jms/util/PollingMessageListenerContainer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c0b59836/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 8c68338..c087f25 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -69,12 +69,12 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.commit();
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
 safeRollBack(session, e);
 }
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
 } finally {
 ResourceCloser.close(consumer);
@@ -89,7 +89,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.rollback();
 }
-} catch (Exception e1) {
+} catch (Throwable e1) {
 LOG.log(Level.WARNING, "Rollback of Local transaction failed", 
e1);
 }
 }

[2/4] cxf git commit: [CXF-6672] Catch trhowable instead of exception to grab errors as well

2017-03-24 Thread dkulp 
[CXF-6672] Catch trhowable instead of exception to grab errors as well

# Conflicts:
#   
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 41db6153feec7f81190de235d4797cc18fb4bf6d
Parents: 89e2e1b
Author: Daniel Kulp 
Authored: Thu Mar 23 14:12:29 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:49:35 2017 -0400

--
 .../transport/jms/util/PollingMessageListenerContainer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/41db6153/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index f79ab09..8b904e2 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -71,12 +71,12 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.commit();
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
 safeRollBack(session, e);
 }
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
 } finally {
 ResourceCloser.close(consumer);
@@ -91,7 +91,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.rollback();
 }
-} catch (Exception e1) {
+} catch (Throwable e1) {
 LOG.log(Level.WARNING, "Rollback of Local transaction failed", 
e1);
 }
 }