#82: return null if key is not present

baloise · Aug 21, 2022 · 6082c5e · 6082c5e
1 parent c786aaa
commit 6082c5e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/com/baloise/confluence/digitalsignature/Signature.java b/src/main/java/com/baloise/confluence/digitalsignature/Signature.java
@@ -1,6 +1,7 @@
 package com.baloise.confluence.digitalsignature;
 
 import com.atlassian.bandana.BandanaManager;
+import com.google.common.collect.Sets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import lombok.Getter;
@@ -51,6 +52,11 @@ static Signature deserialize(String serialization) {
   }
 
   public static Signature fromBandana(BandanaManager mgr, String key) {
+    if (mgr.getKeys(GLOBAL_CONTEXT) == null
+        || !Sets.newHashSet(mgr.getKeys(GLOBAL_CONTEXT)).contains(key)) {
+      return null;
+    }
+
     Object value = mgr.getValue(GLOBAL_CONTEXT, key);
 
     if (value == null) {