Harden test

thegridman · Nov 22, 2023 · fa27ce2 · fa27ce2
1 parent df94946
commit fa27ce2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...e-core/src/main/java/com/tangosol/internal/net/topic/impl/paged/PagedTopicSubscriber.java b/...e-core/src/main/java/com/tangosol/internal/net/topic/impl/paged/PagedTopicSubscriber.java
@@ -1310,12 +1310,12 @@ protected void complete(BatchingOperationsQueue<Request, ?> queueRequest,
                             ReceiveRequest receiveRequest = (ReceiveRequest) request;
                             if (!receiveRequest.isBatch())
                                 {
-                                // this is a single request, i.e subscriber.receive();
+                                // this is a single request, i.e. subscriber.receive();
                                 aValues.set(cValues, null);
                                 }
                             else
                                 {
-                                // this is a batch request, i.e subscriber.receive(100);
+                                // this is a batch request, i.e. subscriber.receive(100);
                                 aValues.set(cValues, Collections.emptyList());
                                 }
                             cValues++;
@@ -1361,7 +1361,7 @@ protected void complete(BatchingOperationsQueue<Request, ?> queueRequest,
                                 }
                             else
                                 {
-                                // this is a single request, i.e subscriber.receive();
+                                // this is a single request, i.e. subscriber.receive();
                                 element = queuePrefetched.poll();
                                 // ensure we still own the channel
                                 if (element != null && !element.isEmpty() && isOwner(element.getChannel()))

diff --git a/prj/test/functional/topics/src/main/java/topics/bug_35945522/SubscriberMain.java b/prj/test/functional/topics/src/main/java/topics/bug_35945522/SubscriberMain.java
@@ -58,7 +58,7 @@ public static void main(String[] args) throws Exception
                     catch (Throwable t)
                         {
                         Logger.info("Exception occurred waiting on receive: "
-                                + t.getMessage() + "\n" + subscriber);
+                                + t.getClass().getSimpleName() + " " + t.getMessage() + "\n" + subscriber);
                         if (future != null && !future.isDone())
                             {
                             try
@@ -69,8 +69,7 @@ public static void main(String[] args) throws Exception
                                     {
                                     try
                                         {
-                                        Logger.info("Future completed before cancellation. message = "
-                                                + future.get(1, TimeUnit.SECONDS));
+                                        Logger.info("Future completed before cancellation");
                                         }
                                     catch (Throwable e)
                                         {
@@ -87,6 +86,16 @@ public static void main(String[] args) throws Exception
                                 Logger.err(t);
                                 }
                             }
+                        else
+                            {
+                            Logger.info("Future completed after exception");
+                            }
+                        if (future != null && future.isDone() && !future.isCancelled() && !future.isCompletedExceptionally())
+                            {
+                            Element<String> element = future.get(cWaitSeconds, TimeUnit.SECONDS);
+                            Logger.info("Received message: " + element);
+                            s_cReceived++;
+                            }
                         }
                     }
                 }