Minor improvements

eclipse-vertx · Mar 22, 2016 · 7ca0a51 · 7ca0a51
1 parent 0e0c833
commit 7ca0a51
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java b/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java
@@ -244,19 +244,24 @@ public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int stream
   @Override
   public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) {
     VertxHttp2Stream req = streams.get(streamId);
-    context.executeFromIO(() -> {
-      req.handleReset(errorCode);
-    });
+    if (req != null) {
+      context.executeFromIO(() -> {
+        req.handleReset(errorCode);
+      });
+    }
   }
 
   @Override
   public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream) {
     VertxHttp2Stream req = streams.get(streamId);
-    context.executeFromIO(() -> {
-      req.handleData(Buffer.buffer(data.copy()));
-    });
-    if (endOfStream) {
-      context.executeFromIO(req::handleEnd);
+    if (req != null) {
+      Buffer buff = Buffer.buffer(data.copy());
+      context.executeFromIO(() -> {
+        req.handleData(buff);
+      });
+      if (endOfStream) {
+        context.executeFromIO(req::handleEnd);
+      }
     }
     return padding;
   }