X-Git-Url: https://git.pterodactylus.net/?p=WoTNS.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fmain%2FResolver.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fmain%2FResolver.java;h=94a098ea551a11a4860650122872727f4cb45f33;hp=4e535284b7b00f20c0b4e84cddb1b620eddc519f;hb=4923393686ef13ae2426a78711ef104c2ed1bfa8;hpb=4e1244ef54d89818d48af3b1070d799c89734f15

diff --git a/src/main/java/net/pterodactylus/wotns/main/Resolver.java b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index 4e53528..94a098e 100644
--- a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@ -91,20 +91,17 @@ public class Resolver {
 			keyStart = shortName.substring(atSign + 1);
 		}
 		final OwnIdentity ownIdentity;
-		if ((this.ownIdentityId != null) && (identityManager.getOwnIdentity(this.ownIdentityId) != null)) {
-			ownIdentity = identityManager.getOwnIdentity(this.ownIdentityId);
-		} else if (this.ownIdentityId == null) {
-			Set<OwnIdentity> ownIdentities = identityManager.getAllOwnIdentities();
-			if (!ownIdentities.isEmpty()) {
-				ownIdentity = ownIdentities.iterator().next();
+		if (this.ownIdentityId != null) {
+			if (identityManager.getOwnIdentity(this.ownIdentityId) != null) {
+				ownIdentity = identityManager.getOwnIdentity(this.ownIdentityId);
 			} else {
-				ownIdentity = null;
+				ownIdentity = getFirstOwnIdentity();
 			}
 		} else {
-			logger.log(Level.SEVERE, "Can not resolve “" + shortName + "” without a Web of Trust Identity!");
-			ownIdentity = null;
+			ownIdentity = getFirstOwnIdentity();
 		}
 		if (ownIdentity == null) {
+			logger.log(Level.SEVERE, "Can not resolve “" + shortName + "” without a Web of Trust Identity!");
 			return null;
 		}
 		System.out.println("using own identity " + ownIdentity + " to resolve " + shortName);