Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2333

Browse Source
This commit is contained in:
Gary Russell
2011-12-22 15:18:59 -05:00
committed by Mark Fisher
parent 0e791e38e9
commit df1821a279
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java
View File

@@ -18,6 +18,7 @@ package org.springframework.integration.ip.tcp.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
@@ -118,7 +119,15 @@ public class TcpNioClientConnectionFactory extends
this.selector = Selector.open();
while (this.active) {
SocketChannel newChannel;
int selectionCount = selector.select(this.soTimeout);
int soTimeout = this.getSoTimeout();
int selectionCount = 0;
try {
selectionCount = selector.select(soTimeout < 0 ? 0 : soTimeout);
} catch (CancelledKeyException cke) {
if (logger.isDebugEnabled()) {
logger.debug("CancelledKeyException during Selector.select()");
}
}
while ((newChannel = newChannels.poll()) != null) {
try {
newChannel.register(this.selector, SelectionKey.OP_READ, connections.get(newChannel));