X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=61068f8845eb7a77ce30d15c33568f7c167a62ea;hb=1bc88510da721fc90b270e4706ee2bdab41ecd18;hp=0425e4771c3cd2e3357a21ecc27fda567d716f86;hpb=a5645443fd6dd34625d56441d3374104f46cfbe9;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 0425e47..61068f8 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -25,6 +25,9 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.freenet.plugin.ConnectorListener;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
+import net.pterodactylus.sone.freenet.plugin.PluginException;
 import net.pterodactylus.util.logging.Logging;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
@@ -71,10 +74,10 @@ public class WebOfTrustConnector implements ConnectorListener {
 	 * Loads all own identities from the Web of Trust plugin.
 	 *
 	 * @return All own identity
-	 * @throws PluginException
+	 * @throws WebOfTrustException
 	 *             if the own identities can not be loaded
 	 */
-	public Set<OwnIdentity> loadAllOwnIdentities() throws PluginException {
+	public Set<OwnIdentity> loadAllOwnIdentities() throws WebOfTrustException {
 		Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get(), "OwnIdentities");
 		SimpleFieldSet fields = reply.getFields();
 		int ownIdentityCounter = -1;
@@ -320,6 +323,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) {