Prevent null from being put into the FlowControlledBuffer

AxonIQ · Jul 8, 2022 · 61a13f7 · 61a13f7
1 parent 4e38024
commit 61a13f7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/io/axoniq/axonserver/connector/impl/FlowControlledBuffer.java b/src/main/java/io/axoniq/axonserver/connector/impl/FlowControlledBuffer.java
@@ -46,6 +46,9 @@ public abstract class FlowControlledBuffer<T, R> extends FlowControlledStream<T,
      */
     public FlowControlledBuffer(String clientId, int bufferSize, int refillBatch) {
         super(clientId, bufferSize, refillBatch);
+        if (terminalMessage() == null) {
+            throw new IllegalStateException("Terminal message is not allowed to be null");
+        }
     }
 
     /**
@@ -57,6 +60,9 @@ public FlowControlledBuffer(String clientId, int bufferSize, int refillBatch) {
 
     @Override
     public void onNext(T value) {
+        if (value == null) {
+            throw new NullPointerException("Next value of buffer is not allowed to be null");
+        }
         buffer.offer(value);
     }