Added changes from Moka7 1.0.2

xtrinch · Sep 14, 2017 · 73e65d8 · 73e65d8
1 parent 41fee76
commit 73e65d8
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/src/com/sourceforge/snap7/moka7/S7Client.java b/src/com/sourceforge/snap7/moka7/S7Client.java
@@ -538,6 +538,32 @@ public int Connect()
  } 
  }
  Connected=LastError==0;
+
+ // In case the connection is not completely established (TCP connection + ISO connection + PDU negotiation)
+ // we close the socket and its IO streams to revert the object back to pre-Connect() state
+ if (!Connected)
+ {
+ if (TCPSocket != null) {
+ try {
+ TCPSocket.close();
+ } catch (IOException ex) {
+ }
+ }
+ if (InStream != null) {
+ try {
+ InStream.close();
+ } catch (IOException ex) {
+ }
+ }
+ if (OutStream != null) {
+ try {
+ OutStream.close();
+ } catch (IOException ex) {
+ }
+ }
+ _PDULength = 0;
+ } 
+
  return LastError;
  }