From b0e475f09c71b02ff549bc595c79b8bd93507d18 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 18 Jul 2012 12:36:14 -0700 Subject: [PATCH] Fixing invalid statuscode error that shouldn't be thrown on no-status code --- .../java/org/eclipse/jetty/websocket/protocol/CloseInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java index 0d632d180e8..62c93d6e767 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java @@ -37,7 +37,7 @@ public class CloseInfo public CloseInfo(ByteBuffer payload, boolean validate) { - this.statusCode = 0; + this.statusCode = -1; this.reason = null; if ((payload == null) || (payload.remaining() == 0)) @@ -54,6 +54,7 @@ public class CloseInfo if (data.remaining() >= 2) { // Status Code + statusCode = 0; // start with 0 statusCode |= (data.get() & 0xFF) << 8; statusCode |= (data.get() & 0xFF);