[cxf] branch 3.3.x-fixes updated: CXF-8205 - Fix PollingMessageListenerContainer shutdown warnings

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
     new d60a07f  CXF-8205 - Fix PollingMessageListenerContainer shutdown 
warnings
d60a07f is described below

commit d60a07f3469cbbf1db1a0972f68505db79c66bed
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Jan 29 11:36:11 2020 +0000

    CXF-8205 - Fix PollingMessageListenerContainer shutdown warnings
    
    (cherry picked from commit 7fba5a452925ad0ea5842fb10b0c8896ae8a49e4)
---
 .../jms/util/AbstractMessageListenerContainer.java          |  2 +-
 .../transport/jms/util/PollingMessageListenerContainer.java | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/AbstractMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/AbstractMessageListenerContainer.java
index 9950ef4..eaf6995 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/AbstractMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/AbstractMessageListenerContainer.java
@@ -45,7 +45,7 @@ public abstract class AbstractMessageListenerContainer 
implements JMSListenerCon
     protected boolean transacted;
     protected int acknowledgeMode = Session.AUTO_ACKNOWLEDGE;
     protected String messageSelector;
-    protected boolean running;
+    protected volatile boolean running;
     protected String durableSubscriptionName;
     protected boolean pubSubNoLocal;
     protected TransactionManager transactionManager;
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 cbe8b60..51a1fa4 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
@@ -82,9 +82,10 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
                         try {
                             if (message != null) {
                                 listenerHandler.onMessage(message);
-                            }
-                            if (session.getTransacted()) {
-                                session.commit();
+
+                                if (session.getTransacted()) {
+                                    session.commit();
+                                }
                             }
                         } catch (Throwable e) {
                             LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
@@ -172,7 +173,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
     private MessageConsumer createConsumer(final Connection connection, final 
Session session)
             throws JMSException {
         final MessageConsumer consumer;
-        
+
         if (jmsConfig != null && jmsConfig.isOneSessionPerConnection()) {
             Destination destination;
             if (!isReply()) {
@@ -185,7 +186,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
         } else {
             consumer = createConsumer(session);
         }
-        
+
         return consumer;
     }
 
@@ -200,7 +201,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
         }
         return session.createConsumer(destination, messageSelector);
     }
-    
+
     protected void handleException(Throwable e) {
         running = false;
         JMSException wrapped;