X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=becb178cce6879a8720e784f5324c5be19bf2ea2;hb=f910b58e34b2b94931c609f22ecde49b232b881d;hp=68f9e5f5b1adb2abdae047e5858f2aad46298b52;hpb=02b72e2a9a8537f64570f05419e177d821d39598;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 68f9e5f..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 + "PropertyName" + ++propertiesCounter);
+			String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name");
 			if (propertyName == null) {
 				break;
 			}
-			String propertyValue = fields.get(prefix + "PropertyValue" + propertiesCounter);
+			String propertyValue = fields.get(prefix + "Property" + propertiesCounter + ".Value");
 			properties.put(propertyName, propertyValue);
 		}
 		return properties;
@@ -320,6 +320,10 @@ public class WebOfTrustConnector implements ConnectorListener {
 					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) {