[cxf] branch main updated: Fix org.apache.cxf.transport.jms.RequestResponseTest test cases which fail with 'Can't receive the Conduit Message in 10 seconds' (#1040)

[reta]

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

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
     new a80493b626 Fix org.apache.cxf.transport.jms.RequestResponseTest test 
cases which fail with 'Can't receive the Conduit Message in 10 seconds' (#1040)
a80493b626 is described below

commit a80493b626b985c32e8b66d94bc0d117014ff4f4
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Mon Dec 12 14:31:49 2022 -0500

    Fix org.apache.cxf.transport.jms.RequestResponseTest test cases which fail 
with 'Can't receive the Conduit Message in 10 seconds' (#1040)
---
 .../java/org/apache/cxf/transport/jms/AbstractJMSTester.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index ee9f49089d..dec83281bc 100644
--- 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -94,7 +94,7 @@ public abstract class AbstractJMSTester {
         addressSettings.setAutoCreateQueues(true);
         addressSettings.setAutoDeleteQueues(false);
         addressSettings.setAutoDeleteAddresses(false);
-        config.setAddressesSettings(Collections.singletonMap("#", new 
AddressSettings()));
+        config.setAddressSettings(Collections.singletonMap("#", new 
AddressSettings()));
         broker = new EmbeddedActiveMQ();
         broker.setConfiguration(config);
         SecurityConfiguration securityConfig = new SecurityConfiguration();
@@ -302,7 +302,9 @@ public abstract class AbstractJMSTester {
             synchronized (inMessage) {
                 inMessage.wait(MAX_RECEIVE_TIME * 1000L);
             }
-            assertNotNull("Can't receive the Conduit Message in " + 
MAX_RECEIVE_TIME + " seconds", inMessage.get());
+            if (null == inMessage.get()) {
+                assertNotNull("Can't receive the Conduit Message in " + 
MAX_RECEIVE_TIME + " seconds", inMessage.get());
+            }
         }
         return inMessage.getAndSet(null);
     }
@@ -312,8 +314,10 @@ public abstract class AbstractJMSTester {
             synchronized (destMessage) {
                 destMessage.wait(MAX_RECEIVE_TIME * 1000L);
             }
-            assertNotNull("Can't receive the Destination message in " + 
MAX_RECEIVE_TIME + " seconds",
+            if (null == destMessage.get()) {
+                assertNotNull("Can't receive the Destination message in " + 
MAX_RECEIVE_TIME + " seconds",
                     destMessage.get());
+            }
         }
         return destMessage.getAndSet(null);
     }