From 7e0eb7ad4e90748a23c87b68b1059aa9d876615f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 25 Jun 2014 16:36:39 +0300 Subject: [PATCH] Revert "Fixed infinite loop described in INT-3453." --- .../ip/tcp/connection/TcpNioConnection.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java index 3d62f47f43..a42a03ea29 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java @@ -295,16 +295,8 @@ public class TcpNioConnection extends TcpConnectionSupport { * @throws IOException */ private synchronized Message convert() throws Exception { - if (this.channelInputStream.available() <= 0) { - if (!writingToPipe) { - return null; - } - else { - Thread.sleep(5); - if (this.channelInputStream.available() <= 0) { - return null; - } - } + if (!dataAvailable()) { + return null; } Message message = null; try {