You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by je...@apache.org on 2013/04/10 11:57:04 UTC
git commit: Get rid of textline codec in SSLTest
Updated Branches:
refs/heads/trunk 76916a216 -> 91260fe3a
Get rid of textline codec in SSLTest
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/91260fe3
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/91260fe3
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/91260fe3
Branch: refs/heads/trunk
Commit: 91260fe3a1dd35c39715a670f67c1c2cd95cf564
Parents: 76916a2
Author: Jeff MAURY <je...@apache.org>
Authored: Wed Apr 10 11:56:38 2013 +0200
Committer: Jeff MAURY <je...@apache.org>
Committed: Wed Apr 10 11:56:38 2013 +0200
----------------------------------------------------------------------
.../org/apache/mina/transport/tcp/SslTest.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/91260fe3/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
index fb1532a..85bafbd 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
@@ -25,6 +25,8 @@ import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.Security;
@@ -36,11 +38,7 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.mina.api.AbstractIoHandler;
import org.apache.mina.api.IoSession;
-import org.apache.mina.codec.textline.TextLineDecoder;
-import org.apache.mina.codec.textline.TextLineEncoder;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.nio.tcp.NioTcpServer;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -70,13 +68,13 @@ public class SslTest {
private static class TestHandler extends AbstractIoHandler {
public void messageReceived(IoSession session, Object message) {
- String line = (String) message;
+ String line = Charset.defaultCharset().decode((ByteBuffer) message).toString();
if (line.startsWith("hello")) {
System.out.println("Server got: 'hello', waiting for 'send'");
} else if (line.startsWith("send")) {
System.out.println("Server got: 'send', sending 'data'");
- session.write("data");
+ session.write(Charset.defaultCharset().encode("data\n"));
}
}
}
@@ -90,7 +88,6 @@ public class SslTest {
server.setReuseAddress(true);
server.getSessionConfig().setSslContext(createSSLContext());
- server.setFilters(new ProtocolCodecFilter(new TextLineEncoder(), new TextLineDecoder()));
server.setIoHandler(new TestHandler());
server.bind(new InetSocketAddress(0));
return server.getServerSocketChannel().socket().getLocalPort();