Responder: Check if a message need to be sent (responsePublisher == n…

…ull)
rsocket · Oct 15, 2015 · 468dadf · 468dadf
1 parent 8ab7391
commit 468dadf
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/main/java/io/reactivesocket/internal/Responder.java b/src/main/java/io/reactivesocket/internal/Responder.java
@@ -279,23 +279,25 @@ public void onNext(Frame requestFrame) {
 						final RejectedException exception = new RejectedException("No associated lease");
 						responsePublisher = PublisherUtils.errorFrame(streamId, exception);
 					}
-
-					connection.addOutput(responsePublisher, new Completable() {
-						@Override
-						public void success() {
-							// TODO Auto-generated method stub
-						}
 
-						@Override
-						public void error(Throwable e) {
-							// TODO validate with unit tests
-							if (childTerminated.compareAndSet(false, true)) {
-								errorStream.accept(new RuntimeException("Error writing", e)); // TODO should we have typed RuntimeExceptions?
-								cancel();
+					if (responsePublisher != null) {
+						connection.addOutput(responsePublisher, new Completable() {
+							@Override
+							public void success() {
+								// TODO Auto-generated method stub
 							}
-						}
 
-					});
+							@Override
+							public void error(Throwable e) {
+								// TODO validate with unit tests
+								if (childTerminated.compareAndSet(false, true)) {
+									errorStream.accept(new RuntimeException("Error writing", e)); // TODO should we have typed RuntimeExceptions?
+									cancel();
+								}
+							}
+
+						});
+					}
 				}
 			}