bug fix

hsiafan · Jul 12, 2018 · 3ab6877 · 3ab6877
1 parent 1a6159d
commit 3ab6877
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/net/dongliu/proxy/netty/handler/Http2Interceptor.java b/src/main/java/net/dongliu/proxy/netty/handler/Http2Interceptor.java
@@ -100,6 +100,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
                 message.setResponseBody(responseHeaders.createBody());
                 if (headersEvent.endOfStream()) {
                     message.responseBody().finish();
+                    messageMap.remove(streamId);
                 }
             } else {
                 logger.error("message for stream id {} not found", streamId);
@@ -114,6 +115,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
                 body.append(dataEvent.data().nioBuffer());
                 if (dataEvent.endOfStream()) {
                     body.finish();
+                    messageMap.remove(streamId);
                 }
             } else {
                 logger.error("message for stream id {} not found", streamId);

diff --git a/src/main/java/net/dongliu/proxy/netty/handler/SSLDetector.java b/src/main/java/net/dongliu/proxy/netty/handler/SSLDetector.java
@@ -38,6 +38,7 @@ public class SSLDetector extends ChannelInboundHandlerAdapter {
     private ByteBuf buf;
     private boolean isSSL;
     private Queue<ByteBuf> queue;
+    private boolean removed;
 
     private final NetAddress address;
     private final MessageListener messageListener;
@@ -123,7 +124,10 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
                         ctx.close();
                     }
                 });
-                ctx.pipeline().remove(SSLDetector.this);
+                if (!removed) {
+                    ctx.pipeline().remove(SSLDetector.this);
+                    removed = true;
+                }
             }
         });
     }
@@ -162,6 +166,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
 
     @Override
     public void handlerRemoved(ChannelHandlerContext ctx) {
+        removed = true;
         if (buf != null) {
             ctx.fireChannelRead(buf);
         }