andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #420 from Massive-Dynamics/fix-failed-javadoc

Browse Source 
Fixes a bit of javadoc that was broken by a failed merge
This commit is contained in:
Norman Maurer 2012-06-28 23:51:05 -07:00
commit d0c8c10681
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
View File

@ -92,11 +92,9 @@ public abstract class WebSocketServerHandshaker {
} }
/** /**
<<<<<<< HEAD * Gets the maximum length for any frame's payload.
* Returns the max length for any frame's payload. *
======= * @return The maximum length for a frame's payload
* Returns the max length for any frame's payload
>>>>>>> abd10d9... Fixed bug where subprotocol not sent by client
*/ */
public int getMaxFramePayloadLength() { public int getMaxFramePayloadLength() {
return maxFramePayloadLength; return maxFramePayloadLength;