X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=c4e8d8928fbb34c397bb89f901fc0ed1a28a4498;hp=531275d1bfd67fe0b90f9b37ae550f9efc46656e;hb=1c42e5da30f0d5f95f91b436fc26e6095650f4f1;hpb=d1e011bc62bede509d8482dfeea950823b974413

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 531275d..c4e8d89 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -144,8 +144,8 @@ public class WebOfTrustConnector {
 			identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
 			identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
 			Integer trust = Numbers.safeParseInteger(fields.get("Trust" + identityCounter), null);
-			int score = Numbers.safeParseInteger(fields.get("Score" + identityCounter));
-			int rank = Numbers.safeParseInteger(fields.get("Rank" + identityCounter));
+			int score = Numbers.safeParseInteger(fields.get("Score" + identityCounter), 0);
+			int rank = Numbers.safeParseInteger(fields.get("Rank" + identityCounter), 0);
 			identity.setTrust(ownIdentity, new Trust(trust, score, rank));
 			identities.add(identity);
 		}
@@ -399,14 +399,19 @@ public class WebOfTrustConnector {
 		};
 		pluginConnector.addConnectorListener(WOT_PLUGIN_NAME, identifier, connectorListener);
 		synchronized (reply) {
-			pluginConnector.sendRequest(WOT_PLUGIN_NAME, identifier, fields, data);
 			try {
-				reply.wait();
-			} catch (InterruptedException ie1) {
-				logger.log(Level.WARNING, String.format("Got interrupted while waiting for reply on %s.", fields.get("Message")), ie1);
+				pluginConnector.sendRequest(WOT_PLUGIN_NAME, identifier, fields, data);
+				while (reply.getFields() == null) {
+					try {
+						reply.wait();
+					} catch (InterruptedException ie1) {
+						logger.log(Level.WARNING, String.format("Got interrupted while waiting for reply on %s.", fields.get("Message")), ie1);
+					}
+				}
+			} finally {
+				pluginConnector.removeConnectorListener(WOT_PLUGIN_NAME, identifier, connectorListener);
 			}
 		}
-		pluginConnector.removeConnectorListener(WOT_PLUGIN_NAME, identifier, connectorListener);
 		logger.log(Level.FINEST, String.format("Received FCP Response for %s: %s", fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null));
 		if ((reply.getFields() == null) || "Error".equals(reply.getFields().get("Message"))) {
 			throw new PluginException("Could not perform request for " + fields.get("Message"));