projects
/
WoTNS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent exception if own identity does not have the correct context.
[WoTNS.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
wotns
/
freenet
/
wot
/
IdentityManager.java
diff --git
a/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
b/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
index
e9107fe
..
eefb372
100644
(file)
--- a/
src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
+++ b/
src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
@@
-28,6
+28,7
@@
import java.util.logging.Logger;
import net.pterodactylus.util.collection.SetBuilder;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.collection.SetBuilder;
import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.object.Default;
import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.wotns.freenet.plugin.PluginException;
import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.wotns.freenet.plugin.PluginException;
@@
-177,7
+178,7
@@
public class IdentityManager extends AbstractService {
identities.add(ownIdentity);
}
synchronized (syncObject) {
identities.add(ownIdentity);
}
synchronized (syncObject) {
- identities.addAll(
currentTrustedIdentities.get(ownIdentity
));
+ identities.addAll(
Default.forNull(currentTrustedIdentities.get(ownIdentity), Collections.<Identity> emptySet()
));
}
return identities.get();
}
}
return identities.get();
}