Fixing autoreconnection issues

Hurence · Apr 16, 2018 · 15ea757 · 15ea757
1 parent d585327
commit 15ea757
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/hurence/opc/da/OpcDaOperations.java b/src/main/java/com/hurence/opc/da/OpcDaOperations.java
@@ -164,7 +164,7 @@ public void connect(OpcDaConnectionProfile connectionProfile) {
             syncIO = group.getSyncIO();
         } catch (Exception e) {
             try {
-                cleanup();
+                disconnect();
             } finally {
                 throw new OpcException("Unexpected exception occurred while connecting", e);
             }

diff --git a/src/main/java/com/hurence/opc/util/AutoReconnectOpcOperations.java b/src/main/java/com/hurence/opc/util/AutoReconnectOpcOperations.java
@@ -73,12 +73,16 @@ public void connect(S connectionProfile) {
             executorService = Executors.newSingleThreadExecutor();
             shouldKeepAlive = true;
             executorService.execute(() -> {
-                while (awaitDisconnected()) {
+                while (shouldKeepAlive) {
+                    if (getConnectionState() == ConnectionState.CONNECTED) {
+                        awaitDisconnected();
+                    }
                     if (shouldKeepAlive) {
                         logger.info("Detected disconnection. Triggering reconnection");
                         try {
                             connect(connectionProfile);
-                        }  catch (OpcException e) {
+                            awaitConnected();
+                        }  catch (Exception e) {
                             logger.warn("Error while reconnecting. Retrying in 1 second", e);
                             try {
                                 Thread.sleep(1000);

diff --git a/src/test/java/com/hurence/opc/da/OpcDaOperationsTest.java b/src/test/java/com/hurence/opc/da/OpcDaOperationsTest.java
@@ -96,7 +96,6 @@ public void testWriteValuesFails() {
     public void testAutoReconnect() throws Exception {
         AutoReconnectOpcOperations autoReconnectOpcOperations = new AutoReconnectOpcOperations(opcDaOperations);
         opcDaOperations.disconnect();
-
         autoReconnectOpcOperations.connect(connectionProfile);
         Assert.assertTrue(autoReconnectOpcOperations.awaitConnected());
         //force disconnect