From 0152035958bc98c67c8a579f373444cbbe1fb99f Mon Sep 17 00:00:00 2001
From: Jorge Villada <jorge.villada@novaip.com.co>
Date: Fri, 10 Jul 2015 19:22:44 -0500
Subject: [PATCH] The same issue # 14, packet loss on a congested network where
 latency is very high with mikrotik (2000ms ping), losing connection, but is
 was never notified. SoTimeout implemented, it runs after setting the overall
 timeout. The wait is changed, CountDownLatch is used, so that the timeout is
 really expected.

---
 .../mikrotik/impl/ApiConnectionImpl.java      | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
index 1443707..0f0b9d2 100644
--- a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
+++ b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
@@ -14,7 +14,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import me.legrange.mikrotik.ApiConnection;
@@ -88,6 +90,11 @@ public final class ApiConnectionImpl extends ApiConnection {
     @Override
     public void setTimeout(int timeout) throws MikrotikApiException {
         if (timeout > 0) {
+            try {
+                sock.setSoTimeout(timeout);
+            } catch (Exception e) {
+                throw new MikrotikApiException(e.getMessage(), e);
+            }
             this.timeout = timeout;
         } else {
             throw new MikrotikApiException(String.format("Invalid timeout value '%d'; must be postive", timeout));
@@ -451,16 +458,18 @@ public final class ApiConnectionImpl extends ApiConnection {
 
     private class SyncListener implements ResultListener {
 
+        CountDownLatch latch = new CountDownLatch(1);
+
         @Override
         public synchronized void error(MikrotikApiException ex) {
             this.err = ex;
-            notify();
+            latch.countDown();
         }
 
         @Override
         public synchronized void completed() {
             complete = true;
-            notify();
+            latch.countDown();
         }
 
         synchronized void completed(Done done) {
@@ -470,7 +479,7 @@ public final class ApiConnectionImpl extends ApiConnection {
                 results.add(res);
             }
             complete = true;
-            notify();
+            latch.countDown();
         }
 
         @Override
@@ -480,22 +489,10 @@ public final class ApiConnectionImpl extends ApiConnection {
 
         private List<Map<String, String>> getResults(int timeout) throws MikrotikApiException {
             try {
-                synchronized (this) { // don't wait if we already have a result.
-                    int waitTime = timeout;
-                    while (!complete && (waitTime > 0)) {
-                        long start = System.currentTimeMillis();
-                        wait(waitTime);
-                        waitTime = waitTime - (int) (System.currentTimeMillis() - start);
-                        if ((waitTime <= 0) && !complete) {
-                            err = new ApiConnectionException(String.format("Command timed out after %d ms", timeout));
-                        }
-                    }
-                }
-            } catch (InterruptedException ex) {
-                throw new ApiConnectionException(ex.getMessage(), ex);
-            }
-            if (err != null) {
-                throw new MikrotikApiException(err.getMessage(), err);
+                latch.await(timeout, TimeUnit.MILLISECONDS);
+            } catch (Exception ex) {
+                err = new ApiConnectionException(String.format("Command timed out after %d ms", timeout));
+                throw new MikrotikApiException(ex.getMessage(), err);
             }
             return results;
         }