X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=becb178cce6879a8720e784f5324c5be19bf2ea2;hb=0157d6ead52bd7c3052b368bed7026075be7cb33;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..becb178 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -88,8 +88,8 @@ public class WebOfTrustConnector implements ConnectorListener {
 			String insertUri = fields.get("InsertURI" + ownIdentityCounter);
 			String nickname = fields.get("Nickname" + ownIdentityCounter);
 			OwnIdentity ownIdentity = new OwnIdentity(id, nickname, requestUri, insertUri);
-			ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter, fields));
-			ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter, fields));
+			ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter + ".", fields));
+			ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter + ".", fields));
 			ownIdentities.add(ownIdentity);
 		}
 		return ownIdentities;
@@ -134,8 +134,8 @@ public class WebOfTrustConnector implements ConnectorListener {
 			String nickname = fields.get("Nickname" + identityCounter);
 			String requestUri = fields.get("RequestURI" + identityCounter);
 			Identity identity = new Identity(id, nickname, requestUri);
-			identity.setContexts(parseContexts("Contexts" + identityCounter, fields));
-			identity.setProperties(parseProperties("Properties" + identityCounter, fields));
+			identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
+			identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
 			identities.add(identity);
 		}
 		return identities;
@@ -265,11 +265,11 @@ public class WebOfTrustConnector implements ConnectorListener {
 		Map<String, String> properties = new HashMap<String, String>();
 		int propertiesCounter = -1;
 		while (true) {
-			String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + "Name");
+			String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name");
 			if (propertyName == null) {
 				break;
 			}
-			String propertyValue = fields.get(prefix + "Property" + propertiesCounter + "Value");
+			String propertyValue = fields.get(prefix + "Property" + propertiesCounter + ".Value");
 			properties.put(propertyName, propertyValue);
 		}
 		return properties;
@@ -315,9 +315,19 @@ 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) {
+					for (String targetMessage : targetMessages) {
+						replies.remove(targetMessage);
+					}
+					replies.remove("Error");
+					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 +350,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);