From 4f3685b05a0afc02ea1f94d7afc29cf805d7f5dd Mon Sep 17 00:00:00 2001 From: norman Date: Tue, 10 Apr 2012 14:17:22 +0200 Subject: [PATCH] Make it compatible with java5. See #250 --- .../codec/http/websocketx/CloseWebSocketFrame.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java index 9e904ddd00..d92182224e 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java @@ -15,6 +15,8 @@ */ package org.jboss.netty.handler.codec.http.websocketx; +import java.io.UnsupportedEncodingException; + import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.util.CharsetUtil; @@ -74,7 +76,12 @@ public class CloseWebSocketFrame extends WebSocketFrame { byte[] reasonBytes = new byte[0]; if (reasonText != null) { - reasonBytes = reasonText.getBytes(CharsetUtil.UTF_8); + try { + reasonBytes = reasonText.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + // This should never happen, anyway provide a fallback here + reasonBytes = reasonText.getBytes(); + } } ChannelBuffer binaryData = ChannelBuffers.buffer(2 + reasonBytes.length);