From be57cf3b51bc9f6e12ef992c2999cd406e1956ea Mon Sep 17 00:00:00 2001 From: Cruz Julian Bishop Date: Fri, 29 Jun 2012 15:03:41 +1000 Subject: [PATCH] Fixes a bit of javadoc that was broken by a failed merge --- .../codec/http/websocketx/WebSocketServerHandshaker.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java index c16f95f95c..dbc2aea64d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java @@ -92,11 +92,9 @@ public abstract class WebSocketServerHandshaker { } /** -<<<<<<< HEAD - * Returns the max length for any frame's payload. -======= - * Returns the max length for any frame's payload ->>>>>>> abd10d9... Fixed bug where subprotocol not sent by client + * Gets the maximum length for any frame's payload. + * + * @return The maximum length for a frame's payload */ public int getMaxFramePayloadLength() { return maxFramePayloadLength;