Author: elecharny
Date: Sat Apr 16 12:13:57 2011
New Revision: 1093975
URL: http://svn.apache.org/viewvc?rev=1093975&view=rev
Log:
Renamed the NioSocketSession to NioTcpSession
Added:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
- copied, changed from r1093973,
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java
Removed:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1093975&r1=1093974&r2=1093975&view=diff
==============================================================================
---
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
(original)
+++
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Sat Apr 16 12:13:57 2011
@@ -70,10 +70,10 @@ public class NioSelectorProcessor implem
private final Queue<ServerSocketChannel> serversToRemove = new
ConcurrentLinkedQueue<ServerSocketChannel>();
// new session freshly accepted, placed here for being added to the
selector
- private final Queue<NioSocketSession> sessionsToConnect = new
ConcurrentLinkedQueue<NioSocketSession>();
+ private final Queue<NioTcpSession> sessionsToConnect = new
ConcurrentLinkedQueue<NioTcpSession>();
// session to be removed of the selector
- private final Queue<NioSocketSession> sessionsToClose = new
ConcurrentLinkedQueue<NioSocketSession>();
+ private final Queue<NioTcpSession> sessionsToClose = new
ConcurrentLinkedQueue<NioTcpSession>();
private Selector selector;
@@ -137,7 +137,7 @@ public class NioSelectorProcessor implem
public void createSession(IoService service, Object clientSocket) {
log.debug("create session");
SocketChannel socketChannel = (SocketChannel) clientSocket;
- NioSocketSession session = new NioSocketSession((NioTcpServer)
service, socketChannel);
+ NioTcpSession session = new NioTcpSession((NioTcpServer) service,
socketChannel);
// TODO : configure
try {
@@ -162,7 +162,7 @@ public class NioSelectorProcessor implem
private Map<ServerSocketChannel, SelectionKey> serverKey = new
HashMap<ServerSocketChannel, SelectionKey>();
// map for fining keys associated with a given session
- private Map<NioSocketSession, SelectionKey> sessionKey = new
HashMap<NioSocketSession, SelectionKey>();
+ private Map<NioTcpSession, SelectionKey> sessionKey = new
HashMap<NioTcpSession, SelectionKey>();
@Override
public void run() {
@@ -205,7 +205,7 @@ public class NioSelectorProcessor implem
// pop new session for starting read/write
if (sessionsToConnect.size() > 0) {
while (!sessionsToConnect.isEmpty()) {
- NioSocketSession session =
sessionsToConnect.poll();
+ NioTcpSession session = sessionsToConnect.poll();
SelectionKey key =
session.getSocketChannel().register(selector, SelectionKey.OP_READ);
key.attach(session);
sessionKey.put(session, key);
@@ -215,7 +215,7 @@ public class NioSelectorProcessor implem
// pop session for close
if (sessionsToClose.size() > 0) {
while (!sessionsToClose.isEmpty()) {
- NioSocketSession session = sessionsToClose.poll();
+ NioTcpSession session = sessionsToClose.poll();
SelectionKey key = sessionKey.remove(session);
key.cancel();
@@ -245,7 +245,7 @@ public class NioSelectorProcessor implem
if (key.isReadable()) {
log.debug("readable client {}", key);
- NioSocketSession session = (NioSocketSession)
key.attachment();
+ NioTcpSession session = (NioTcpSession)
key.attachment();
SocketChannel channel =
session.getSocketChannel();
int readCount = channel.read(readBuffer);
log.debug("read {} bytes", readCount);
Copied:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
(from r1093973,
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java)
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java&r1=1093973&r2=1093975&rev=1093975&view=diff
==============================================================================
---
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java
(original)
+++
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Sat Apr 16 12:13:57 2011
@@ -34,11 +34,11 @@ import org.apache.mina.transport.tcp.nio
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*
*/
-public class NioSocketSession extends AbstractIoSession {
+public class NioTcpSession extends AbstractIoSession {
private SocketChannel channel;
- NioSocketSession(NioTcpServer service,SocketChannel channel) {
+ NioTcpSession(NioTcpServer service,SocketChannel channel) {
super(service);
this.channel = channel;
}
