Author: jvermillard
Date: Sun Dec 11 18:57:04 2011
New Revision: 1213041
URL: http://svn.apache.org/viewvc?rev=1213041&view=rev
Log:
removed some useless cast
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1213041&r1=1213040&r2=1213041&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Sun Dec 11 18:57:04 2011
@@ -53,7 +53,6 @@ import org.apache.mina.service.SelectorS
import org.apache.mina.session.DefaultWriteFuture;
import org.apache.mina.session.SslHelper;
import org.apache.mina.session.WriteRequest;
-import org.apache.mina.transport.tcp.nio.NioTcpServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -194,8 +193,7 @@ public class NioSelectorProcessor implem
LOGGER.debug("create session");
final SocketChannel socketChannel = (SocketChannel) clientSocket;
final SocketSessionConfig defaultConfig = (SocketSessionConfig)
service.getSessionConfig();
- final NioTcpSession session = new NioTcpSession((NioTcpServer)
service, socketChannel,
- strategy.getSelectorForNewSession(this));
+ final NioTcpSession session = new NioTcpSession(service,
socketChannel, strategy.getSelectorForNewSession(this));
try {
socketChannel.configureBlocking(false);
@@ -490,25 +488,25 @@ public class NioSelectorProcessor implem
}
private void processUnwrap(IoSession session, ByteBuffer inBuffer)
throws SSLException {
- SslHelper sslHelper = session.getAttribute( IoSession.SSL_HELPER );
-
+ SslHelper sslHelper = session.getAttribute(IoSession.SSL_HELPER);
+
if (sslHelper == null) {
throw new IllegalStateException();
}
-
+
SSLEngine engine = sslHelper.getEngine();
-
+
// Blind guess : once uncompressed, the resulting buffer will be 3
times bigger
- ByteBuffer appBuffer = ByteBuffer.allocate(inBuffer.limit() * 3 );
- Status status = sslHelper.processUnwrap(engine, inBuffer,
appBuffer );
+ ByteBuffer appBuffer = ByteBuffer.allocate(inBuffer.limit() * 3);
+ Status status = sslHelper.processUnwrap(engine, inBuffer,
appBuffer);
appBuffer.flip();
-
+
if (status == Status.OK) {
// Ok, go through the chain now
session.getFilterChain().processMessageReceived(session,
appBuffer);
}
}
-
+
private boolean processHandShake(IoSession session, ByteBuffer
inBuffer) throws SSLException {
SslHelper sslHelper = session.getAttribute(IoSession.SSL_HELPER);
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?rev=1213041&r1=1213040&r2=1213041&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Sun Dec 11 18:57:04 2011
@@ -25,6 +25,7 @@ import java.net.Socket;
import java.nio.channels.SocketChannel;
import org.apache.mina.api.IoFuture;
+import org.apache.mina.api.IoService;
import org.apache.mina.api.RuntimeIoException;
import org.apache.mina.service.SelectorProcessor;
import org.apache.mina.session.AbstractIoSession;
@@ -67,7 +68,7 @@ public class NioTcpSession extends Abstr
}
};
- NioTcpSession(NioTcpServer service, SocketChannel channel,
SelectorProcessor writeProcessor) {
+ NioTcpSession(IoService service, SocketChannel channel, SelectorProcessor
writeProcessor) {
super(service, writeProcessor);
this.channel = channel;
this.configuration = new ProxySocketSessionConfig(channel.socket());
@@ -222,7 +223,7 @@ public class NioTcpSession extends Abstr
if (!isCreated()) {
throw new RuntimeException("Trying to open a non created session");
}
-
+
state = SessionState.CONNECTED;
}
}