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

INT-1146 close on inbound adapter should close socket regardless of success of channel send

Browse Source
This commit is contained in:
Gary Russell
2010-05-28 22:25:05 +00:00
parent f6ac5c61bb
commit 3b7696449b
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java
View File

@@ -102,7 +102,6 @@ public class TcpNetReceivingChannelAdapter extends
return;
}
if (messageStatus == SocketReader.MESSAGE_COMPLETE) {
processMessage(reader);
if (close) {
logger.debug("Closing socket because close=true");
try {
@@ -110,6 +109,9 @@ public class TcpNetReceivingChannelAdapter extends
} catch (IOException ioe) {
logger.error("Error on close", ioe);
}
}
processMessage(reader);
if (close) {
break;
}
}

20
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java
View File

@@ -177,21 +177,23 @@ public class TcpNioReceivingChannelAdapter extends
return;
}
if (messageStatus == SocketReader.MESSAGE_COMPLETE) {
if (close) {
logger.debug("Closing channel because close=true");
try {
key.channel().close();
} catch (IOException ioe) {
logger.error("Error on close", ioe);
}
}
Message<byte[]> message;
message = mapper.toMessage(reader);
if (message != null) {
sendMessage(message);
if (close) {
logger.debug("Closing channel because close=true");
try {
key.channel().close();
} catch (IOException ioe) {
logger.error("Error on close", ioe);
}
}
}
}
} catch (Exception e) {}
} catch (Exception e) {
logger.error("Failure on read or message send", e);
}
}
@Override