X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=7127e8f403973e14dcad01980232de3d889162be;hb=549697938ac2e2407183c1db511dfa79f8c059f1;hp=a8806c105eecddf308468c9fe9f6a9e7c0fad400;hpb=470ae9420753b23119c103976f5cf060e3cdcd08;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index a8806c1..7127e8f 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -315,9 +315,15 @@ public class WebOfTrustConnector implements ConnectorListener {
 		synchronized (reply) {
 			pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data);
 			try {
-				reply.wait(60000);
+				long now = System.currentTimeMillis();
+				while ((reply.getFields() == null) && ((System.currentTimeMillis() - now) < 60000)) {
+					reply.wait(60000 - (System.currentTimeMillis() - now));
+				}
+				if (reply.getFields() == null) {
+					throw new PluginException("Timeout waiting for " + targetMessages[0] + "!");
+				}
 			} catch (InterruptedException ie1) {
-				logger.log(Level.WARNING, "Got interrupted while waiting for reply on GetOwnIdentities.", ie1);
+				logger.log(Level.WARNING, "Got interrupted while waiting for reply on " + targetMessages[0] + ".", ie1);
 			}
 		}
 		for (String targetMessage : targetMessages) {
@@ -340,6 +346,7 @@ public class WebOfTrustConnector implements ConnectorListener {
 	@Override
 	public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
 		String messageName = fields.get("Message");
+		logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName);
 		Reply reply = replies.remove(messageName);
 		if (reply == null) {
 			logger.log(Level.FINE, "Not waiting for a “%s” message.", messageName);