Better workflow for leadership change while simplified consuming.

nats-io · scottf · May 12, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025
commit c3a5f4ee9fb2fecda76a4fae12cd14703a0c6211
diff --git a/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java b/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java
@@ -130,19 +130,20 @@ protected Message _nextUnmanagedNoWait(String expectedPullSubject) throws Interr
                 case MESSAGE:
                     return msg;
                 case STATUS_TERMINUS:
-                    // if the status applies return null, otherwise it's ignored, fall through
+                    // if the status applies, return null, otherwise it's ignored, fall through
                     if (expectedPullSubject == null || expectedPullSubject.equals(msg.getSubject())) {
                         return null;
                     }
                     break;
                 case STATUS_ERROR:
-                    // if the status applies throw exception, otherwise it's ignored, fall through
+                    // if the status applies, throw exception, otherwise it's ignored, fall through
                     if (expectedPullSubject == null || expectedPullSubject.equals(msg.getSubject())) {
                         throw new JetStreamStatusException(msg.getStatus(), this);
                     }
                     break;
             }
-            // Check again when, regular messages might have arrived
+            // These statuses don't apply to the message that came in,
+            // so we just loop and move on to the next message.
             // 1. Any STATUS_HANDLED
             // 2. STATUS_TERMINUS or STATUS_ERRORS that aren't for expected pullSubject
         }