From c88c1242b4edda2f2cf32f055def4eb738cd9d74 Mon Sep 17 00:00:00 2001 From: Luke Saker <29537386+sakerl@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:56:43 +0100 Subject: [PATCH] search whole log for messages --- .../messaging/jms20/deliverydelay/fat/DelayFullTest.java | 8 ++++---- .../jmsmdb/src/jmsmdb/ejb/MessageDrivenBean.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/fat/src/com/ibm/ws/messaging/jms20/deliverydelay/fat/DelayFullTest.java b/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/fat/src/com/ibm/ws/messaging/jms20/deliverydelay/fat/DelayFullTest.java index fbddb6956db..87a07c4fca0 100644 --- a/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/fat/src/com/ibm/ws/messaging/jms20/deliverydelay/fat/DelayFullTest.java +++ b/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/fat/src/com/ibm/ws/messaging/jms20/deliverydelay/fat/DelayFullTest.java @@ -228,18 +228,18 @@ public void testDeliveryDelayForDifferentDelaysTopic_B() throws Exception { runInServlet("testDeliveryDelayForDifferentDelaysTopic"); - String msg = clientServer.waitForStringInLogUsingLastOffset("Message received on mdb : TopicBindingsMessage2"); + String msg = clientServer.waitForStringInLog("Message received on mdb : TopicBindingsMessage2"); assertNotNull("Could not find the upload message in the trace.log", msg); - msg = clientServer.waitForStringInLogUsingLastOffset("Message received on mdb : TopicBindingsMessage1"); + msg = clientServer.waitForStringInLog("Message received on mdb : TopicBindingsMessage1"); assertNotNull("Could not find the upload message in the trace.log", msg); restartServers(MDB_CONFIG_TOPIC_TCP); runInServlet("testDeliveryDelayForDifferentDelaysTopic_Tcp"); - msg = clientServer.waitForStringInLogUsingLastOffset("Message received on mdb : TopicTCPMessage2"); + msg = clientServer.waitForStringInLog("Message received on mdb : TopicTCPMessage2"); assertNotNull("Could not find the upload message in the trace.log", msg); - msg = clientServer.waitForStringInLogUsingLastOffset("Message received on mdb : TopicTCPMessage1"); + msg = clientServer.waitForStringInLog("Message received on mdb : TopicTCPMessage1"); assertNotNull("Could not find the upload message in the trace.log", msg); restartServers(); diff --git a/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/test-applications/jmsmdb/src/jmsmdb/ejb/MessageDrivenBean.java b/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/test-applications/jmsmdb/src/jmsmdb/ejb/MessageDrivenBean.java index e11b50cf666..89fdf78626b 100644 --- a/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/test-applications/jmsmdb/src/jmsmdb/ejb/MessageDrivenBean.java +++ b/dev/com.ibm.ws.messaging.open_jms20deliverydelay_fat/test-applications/jmsmdb/src/jmsmdb/ejb/MessageDrivenBean.java @@ -59,7 +59,7 @@ public void onMessage(Message message) { min.setTimeInMillis( msg.readLong() ); if ( min.before(now) ) { - System.out.println("Message received on mdb : " + text); + System.out.println("Message received on mdb : " + text + " at " + now); } else { System.out.println(