From beb56878e415daa73132726662ec17381e1759ed Mon Sep 17 00:00:00 2001
From: Veebs <vibuli@gmail.com>
Date: Mon, 17 Oct 2011 13:48:42 +1100
Subject: [PATCH] WIP. AutoBahn tests 6 working. Needed to check if final
 string is UTF-8 compliant.

---
 .../http/websocketx/WebSocket08FrameDecoder.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
index 8b6098ac7d..ba2c6fd4f6 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
@@ -205,7 +205,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
 			} else {
 				framePayloadLength = framePayloadLen1;
 			}
-			
+
 			logger.debug("Frame length =" + framePayloadLength);
 			checkpoint(State.MASKING_KEY);
 		case MASKING_KEY:
@@ -265,13 +265,13 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
 
 					// Check text for UTF8 correctness
 					if (frameOpcode == OPCODE_TEXT || fragmentedFramesText != null) {
+						// Check UTF-8 correctness for this payload
 						checkUTF8String(channel, framePayload.array());
-					}
 
-					// If final frame in a fragmented message, then set
-					// aggregated text so it can be returned
-					if (fragmentedFramesText != null) {
+						// This does a second check to make sure UTF-8
+						// correctness for entire text message
 						aggregatedText = fragmentedFramesText.toString();
+
 						fragmentedFramesText = null;
 					}
 				}
@@ -348,13 +348,13 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
 
 	private void checkUTF8String(Channel channel, byte[] bytes) throws CorruptedFrameException {
 		try {
-			
+
 			StringBuilder sb = new StringBuilder("UTF8 " + bytes.length + " bytes: ");
 			for (byte b : bytes) {
 				sb.append(Integer.toHexString(b)).append(" ");
 			}
 			logger.debug(sb.toString());
-			
+
 			if (fragmentedFramesText == null) {
 				fragmentedFramesText = new UTF8Output(bytes);
 			} else {