Merge pull request #898 from Hunterk95/patch-1

fix npe in transport
mrniko · May 16, 2023 · c5c9b5a · c5c9b5a
2 parents 14f6530 + 42ceb88
commit c5c9b5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/corundumstudio/socketio/transport/PollingTransport.java b/src/main/java/com/corundumstudio/socketio/transport/PollingTransport.java
@@ -98,7 +98,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     } else {
                         // first connection
                         ClientHead client = ctx.channel().attr(ClientHead.CLIENT).get();
-                        handleMessage(req, client.getSessionId(), queryDecoder, ctx);
+                        if (client != null) {
+                            handleMessage(req, client.getSessionId(), queryDecoder, ctx);
+                        }
                     }
                 } finally {
                     req.release();

diff --git a/src/main/java/com/corundumstudio/socketio/transport/WebSocketTransport.java b/src/main/java/com/corundumstudio/socketio/transport/WebSocketTransport.java
@@ -115,7 +115,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     } else {
                         ClientHead client = ctx.channel().attr(ClientHead.CLIENT).get();
                         // first connection
-                        handshake(ctx, client.getSessionId(), path, req);
+                        if (client != null) {
+                            handshake(ctx, client.getSessionId(), path, req);
+                        }
                     }
                 } finally {
                     req.release();