X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=7127e8f403973e14dcad01980232de3d889162be;hb=feaefb2cecf0ca30b7d94e126ca0384435546c08;hp=4758d9589694dea562a98a73b72188de0e827bbf;hpb=ba7980516278401d16e947fad2502e62c0c24160;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 4758d95..7127e8f 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -215,6 +215,17 @@ public class WebOfTrustConnector implements ConnectorListener {
 		performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveProperty").put("Identity", ownIdentity.getId()).put("Property", name).get(), "PropertyRemoved");
 	}
 
+	/**
+	 * Pings the Web of Trust plugin. If the plugin can not be reached, a
+	 * {@link PluginException} is thrown.
+	 *
+	 * @throws PluginException
+	 *             if the plugin is not loaded
+	 */
+	public void ping() throws PluginException {
+		performRequest(SimpleFieldSetConstructor.create().put("Message", "Ping").get(), "Pong");
+	}
+
 	//
 	// PRIVATE ACTIONS
 	//
@@ -304,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) {
@@ -329,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);