Revert "Fixed infinite loop described in INT-3453."

2014-06-25 16:36:39 +03:00
parent 8754fa9ea9
commit 7e0eb7ad4e
1 changed files with 2 additions and 10 deletions
--- 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 {