close abort_call thread leak when no api available

vuapo-eth · Jun 15, 2018 · afcbee0 · afcbee0
1 parent 4c11ae5
commit afcbee0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/isf/logic/TimeAbortCall.java b/src/main/java/isf/logic/TimeAbortCall.java
@@ -6,7 +6,7 @@
 
 public abstract class TimeAbortCall {
 	private static final UIManager UIM = new UIManager("TimeAbrt");
-	public static final ThreadGroup TIME_ABORT_CALL_THREAD = new ThreadGroup("TimeAbortCallThread");
+    public static final ThreadGroup TIME_ABORT_CALL_THREAD = new ThreadGroup("TimeAbortCallThread");
 
 	private final String actionName;
 	private final int tolerance;
@@ -32,7 +32,7 @@ public void run() {
 				success.o = true;
 				synchronized (res) { res.notify(); }
 			}
-		};
+        };
 
 		while(true) {
             try {
@@ -50,6 +50,7 @@ public void run() {
 		try {
 			synchronized (res) { res.wait(timeLimitSeconds*1000); }
 		} catch (InterruptedException e) {
+			t.interrupt();
 			UIM.logException(e, true);
 		}
 		if(!(boolean)success.o) {

diff --git a/src/main/java/isf/spam/NodeManager.java b/src/main/java/isf/spam/NodeManager.java
@@ -109,7 +109,7 @@ public boolean onCall() {
 
 		if(!t.call(CONNECTING_DURATION_TOLERACE)) return false;
 
-		String isNodeSynced = isNodeSynced(api);
+		String isNodeSynced = isNodeSynced(api, true);
 		if(isNodeSynced != null)
 			uim.logDbg(String.format(R.STR.getString("nodes_action_changing"), buildNodeAddress(api), api, isNodeSynced));
 		return isNodeSynced == null;
@@ -227,7 +227,7 @@ public static boolean[] getLatestInclusion(String[] hashes) {
 		return getInclusionStateResponse.getStates();
 	}
 
-	public static GetNodeInfoResponse getNodeInfo(final int parApi, boolean tryMultipleTimes) {
+	public static GetNodeInfoResponse getNodeInfo(final int parApi, final boolean tryingToCreateConnection, int amountOfTries) {
 
 		final ObjectWrapper api = new ObjectWrapper(parApi);
 		final ObjectWrapper res = new ObjectWrapper(null);
@@ -241,13 +241,13 @@ public boolean onCall() {
 					res.o = apis[(int)api.o].getNodeInfo();
 					return true;
 				} catch (Throwable e) {
-					api.o = handleThrowableFromIotaAPI(action, e, (int)api.o);
+					if(!tryingToCreateConnection) api.o = handleThrowableFromIotaAPI(action, e, (int)api.o);
 					return false;
 				}
 			}
 		};
 
-		do { tb.call(NODEINFO_DURATION_TOLERANCE); } while(tryMultipleTimes);
+		do { tb.call(NODEINFO_DURATION_TOLERANCE); } while(res.o == null && amountOfTries-- > 0);
 		return (GetNodeInfoResponse) res.o;
 	}
 
@@ -308,11 +308,11 @@ private static int handleThrowableFromIotaAPI(String failedAction, Throwable e,
 		return getRotatedAPI();
 	}
 
-	private static String isNodeSynced(int api) {
+	private static String isNodeSynced(int api, boolean tryingToCreateConnection) {
 
 		GetNodeInfoResponse getNodeInfoResponse = null;
 		try {
-			getNodeInfoResponse = getNodeInfo(api, false);
+			getNodeInfoResponse = getNodeInfo(api, tryingToCreateConnection, 3);
 		} catch (Throwable e) {
 			return e.getClass().getName() + ": " + e.getMessage();
 		}
@@ -399,7 +399,7 @@ private static void doSyncCheck(final int api) {
 		new Thread(DO_SYNC_CHECK_THREAD_GROUP,"doSyncCheck("+api+")") {
 			@Override
 			public void run() {
-				String error = isNodeSynced(api);
+				String error = isNodeSynced(api, false);
 				if(error != null) connectToAnyNode(api, error);
 			}
 		}.start();