Fixed infinite loop described in INT-3453.

2014-06-24 16:35:42 +04:00
parent d51185d464
commit 05f5011654
1 changed files with 10 additions and 2 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,8 +295,16 @@ public class TcpNioConnection extends TcpConnectionSupport {
 	 * @throws IOException
 	 */
 	private synchronized Message<?> convert() throws Exception {
-		if (!dataAvailable()) {
-			return null;
+		if (this.channelInputStream.available() <= 0) {
+			if (!writingToPipe) {
+				return null;
+			}
+			else {
+				Thread.sleep(5);
+				if (this.channelInputStream.available() <= 0) {
+					return null;
+				}
+			}
 		}
 		Message<?> message = null;
 		try {