projects
/
WoTNS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treat invalid own identity as no own identity.
[WoTNS.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
wotns
/
main
/
Resolver.java
diff --git
a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index
0150f45
..
0d94ce2
100644
(file)
--- a/
src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/
src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@
-87,7
+87,9
@@
public class Resolver {
}
@SuppressWarnings("hiding")
final OwnIdentity ownIdentity;
}
@SuppressWarnings("hiding")
final OwnIdentity ownIdentity;
- if (this.ownIdentityId == null) {
+ 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();
Set<OwnIdentity> ownIdentities = identityManager.getAllOwnIdentities();
if (!ownIdentities.isEmpty()) {
ownIdentity = ownIdentities.iterator().next();
@@
-95,7
+97,7
@@
public class Resolver {
ownIdentity = null;
}
} else {
ownIdentity = null;
}
} else {
- ownIdentity =
identityManager.getOwnIdentity(ownIdentityId)
;
+ ownIdentity =
null
;
}
if (ownIdentity == null) {
return null;
}
if (ownIdentity == null) {
return null;