sruehl commented on a change in pull request #10: Fixed NPE in
S7PlcConnection#close.
URL: https://github.com/apache/incubator-plc4x/pull/10#discussion_r207148665
##########
File path:
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
##########
@@ -183,14 +194,19 @@ public void close() {
(short) 0x0000, (short) 0x000F, DisconnectReason.NORMAL,
Collections.emptyList(),
null);
ChannelFuture sendDisconnectRequestFuture =
channel.writeAndFlush(disconnectRequest);
- sendDisconnectRequestFuture.addListener((ChannelFutureListener)
future -> {
- // Close the session itself.
- channel.closeFuture().await();
+ // Wait if the PLC closes the connection
+ try {
+ // TODO 02.08.18 jf: Do we have global constants for things
like timeouts?
+ channel.closeFuture().await(1_000);
+ } catch (InterruptedException e) {
+ logger.warn("Connection was not closed by PLC, has to be
closed from driver side now.", e);
+ } finally {
+ // close the session itself.
channel.eventLoop().parent().shutdownGracefully();
Review comment:
One thing to note here. If we put this in the finally blog a potential
thrown exception is omitted. Especially as the method is called `gracefully`. I
would suggest to put it outside a finally or wrap it with a try catch ignore.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
