2 files changed, 15 insertions, 6 deletions
diff --git a/feature-simulators/src/main/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRs.java b/feature-simulators/src/main/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRs.java
index 8b653aae..dd0fb7b8 100644
--- a/feature-simulators/src/main/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRs.java
+++ b/feature-simulators/src/main/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRs.java
@@ -99,7 +99,7 @@ public class DMaaPSimulatorJaxRs {
         return response;
     }
 
-    private String waitForNextMessageFromQueue(int timeout, String topicName) {
+    protected String waitForNextMessageFromQueue(int timeout, String topicName) {
         try {
             sleep(timeout);
             if (queues.containsKey(topicName)) {
@@ -129,10 +129,7 @@ public class DMaaPSimulatorJaxRs {
     @Consumes(MediaType.TEXT_PLAIN)
     public String publish(@PathParam("topicName") String topicName, String body) {
         BlockingQueue<String> queue = queues.computeIfAbsent(topicName, entry -> new LinkedBlockingQueue<>());
-
-        if (!queue.offer(body)) {
-            logger.warn("error on topic {}, failed to place body {} on queue", topicName, body);
-        }
+        queue.offer(body);
 
         return "";
     }
diff --git a/feature-simulators/src/test/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRsTest.java b/feature-simulators/src/test/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRsTest.java
index 7200bdce..b1275004 100644
--- a/feature-simulators/src/test/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRsTest.java
+++ b/feature-simulators/src/test/java/org/onap/policy/drools/simulators/DMaaPSimulatorJaxRsTest.java
@@ -21,6 +21,7 @@
 package org.onap.policy.drools.simulators;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doThrow;
 
 import java.io.IOException;
@@ -30,6 +31,7 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletResponse;
 import org.junit.After;
 import org.junit.Before;
@@ -130,6 +132,16 @@ public class DMaaPSimulatorJaxRsTest {
 
     @Test
     public void testWaitForNextMessageFromQueue() throws InterruptedException {
+        CountDownLatch waitCalled = new CountDownLatch(1);
+
+        sim = new DMaaPSimulatorJaxRs() {
+            @Override
+            protected String waitForNextMessageFromQueue(int timeout, String topicName) {
+                waitCalled.countDown();
+                return super.waitForNextMessageFromQueue(timeout, topicName);
+            }
+        };
+
         BlockingQueue<String> queue = new LinkedBlockingQueue<>();
 
         CountDownLatch latch1 = backgroundSubscribe(queue);
@@ -143,7 +155,7 @@ public class DMaaPSimulatorJaxRsTest {
          * Must pause to prevent the topic from being created before subscribe() is
          * invoked.
          */
-        Thread.sleep(LONG_TIMEOUT_MS / 3);
+        assertTrue(waitCalled.await(1, TimeUnit.SECONDS));
 
         // only publish one message
         sim.publish(TOPIC, MESSAGE);