Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-11-03 07:22:09 +0000
committerGreg Wilkins2013-11-03 07:22:09 +0000
commiteb3bb660b52b6eaa146b4fa77afd8fd1f63e6bba (patch)
tree6d501857bbc82c9240ba1cd603f981797349b3d5 /jetty-websocket/websocket-api/src
parent6f1eb712e9bb3341d257a75511ebc8e73e0faca0 (diff)
parent6b0269a16d7ee923ae70082eb60595d432861707 (diff)
downloadorg.eclipse.jetty.project-eb3bb660b52b6eaa146b4fa77afd8fd1f63e6bba.tar.gz
org.eclipse.jetty.project-eb3bb660b52b6eaa146b4fa77afd8fd1f63e6bba.tar.xz
org.eclipse.jetty.project-eb3bb660b52b6eaa146b4fa77afd8fd1f63e6bba.zip
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts: jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
Diffstat (limited to 'jetty-websocket/websocket-api/src')
-rw-r--r--jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
index abd194d24f..43db5aaee6 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
@@ -20,13 +20,11 @@ package org.eclipse.jetty.websocket.api.io;
import java.io.IOException;
import java.io.Writer;
-import java.nio.charset.Charset;
import org.eclipse.jetty.websocket.api.Session;
public class WebSocketWriter extends Writer
{
- private final Charset charset = Charset.forName("UTF-8");
private final Session session;
public WebSocketWriter(Session session)

Back to the top