lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-05-10 10:25:33 +08:00
parent 13ffa2a3e5
commit 970d530fbd
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/redkale/net/ProtocolServer.java
View File

@@ -452,6 +452,7 @@ public abstract class ProtocolServer {
if (key == null || !key.isValid()) return; if (key == null || !key.isValid()) return;
SocketChannel socket = (SocketChannel) key.channel(); SocketChannel socket = (SocketChannel) key.channel();
NIOTCPAsyncConnection conn = (NIOTCPAsyncConnection) key.attachment(); NIOTCPAsyncConnection conn = (NIOTCPAsyncConnection) key.attachment();
if(conn == null) return;
if (key.isReadable()) { if (key.isReadable()) {
if (conn.readHandler != null) readOP(key, socket, conn); if (conn.readHandler != null) readOP(key, socket, conn);
} else if (key.isWritable()) { } else if (key.isWritable()) {
@@ -462,9 +463,7 @@ public abstract class ProtocolServer {
private void readOP(SelectionKey key, SocketChannel socket, NIOTCPAsyncConnection conn) { private void readOP(SelectionKey key, SocketChannel socket, NIOTCPAsyncConnection conn) {
try { try {
final int rs = socket.read(conn.readBuffer); final int rs = socket.read(conn.readBuffer);
key.interestOps(SelectionKey.OP_CONNECT);
//System.out.println(conn + "------readbuf:" + conn.readBuffer + "-------handler:" + conn.readHandler + "-------read: " + rs); //System.out.println(conn + "------readbuf:" + conn.readBuffer + "-------handler:" + conn.readHandler + "-------read: " + rs);
if(conn.readHandler == null) return;
context.runAsync(() -> conn.completeRead(rs)); context.runAsync(() -> conn.completeRead(rs));
} catch (Throwable t) { } catch (Throwable t) {
context.runAsync(() -> conn.faileRead(t)); context.runAsync(() -> conn.faileRead(t));
@@ -496,7 +495,7 @@ public abstract class ProtocolServer {
final ByteBuffer buffer = conn.writeOneBuffer; final ByteBuffer buffer = conn.writeOneBuffer;
while (buffer.hasRemaining()) rs += socket.write(buffer); while (buffer.hasRemaining()) rs += socket.write(buffer);
} }
key.interestOps(SelectionKey.OP_CONNECT); key.interestOps(SelectionKey.OP_READ);
final int rs0 = rs; final int rs0 = rs;
//System.out.println(conn + "------buffers:" + conn.writeBuffers + "---onebuf:" + conn.writeOneBuffer + "-------handler:" + conn.writeHandler + "-------write: " + rs); //System.out.println(conn + "------buffers:" + conn.writeBuffers + "---onebuf:" + conn.writeOneBuffer + "-------handler:" + conn.writeHandler + "-------write: " + rs);
context.runAsync(() -> conn.completeWrite(rs0)); context.runAsync(() -> conn.completeWrite(rs0));