From b6c31e4b57f25dc59813c8585505d26034dc59e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 29 Oct 2010 22:30:21 +0200 Subject: [PATCH] Always at least try to load the contexts before using the empty set. --- .../net/pterodactylus/sone/freenet/wot/Identity.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java index 090bf7f..0e13e9e 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java @@ -102,15 +102,18 @@ public class Identity { } /** - * Returns the contexts of the identity. + * Returns the contexts of the identity. If the contexts have not been + * loaded yet, they will be loaded. If loading the contexts fails, an empty + * set is returned. * * @return The contexts of the identity - * @throws PluginException - * if an error occured communicating with the Web of Trust - * plugin */ - public Set getContexts() throws PluginException { - return getContexts(false); + public Set getContexts() { + try { + return getContexts(false); + } catch (PluginException pe1) { + return Collections.emptySet(); + } } /** @@ -142,7 +145,7 @@ public class Identity { * {@code false} otherwise */ public boolean hasContext(String context) { - return contexts.contains(context); + return getContexts().contains(context); } /** -- 2.7.4