Mark option value as nullable, as orig. intended

Fixes SpongePowered#1497
ReyADayer · Feb 25, 2017 · c641cb0 · c641cb0
1 parent 72b6898
commit c641cb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java b/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java
@@ -239,6 +239,10 @@ public boolean setOption(Set<Context> contexts, String key, @Nullable String val
         Map<String, String> newMap;
 
         if (origMap == null) {
+            if (value == null) {
+                return false;
+            }
+
             if ((origMap = this.options.putIfAbsent(ImmutableSet.copyOf(contexts), ImmutableMap.of(key.toLowerCase(), value))) == null) {
                 return true;
             }

diff --git a/src/main/java/org/spongepowered/api/service/permission/SubjectData.java b/src/main/java/org/spongepowered/api/service/permission/SubjectData.java
@@ -32,6 +32,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * Container for a subject's data. This container updates live, and provides raw
  * data for a subject not taking into account any sort of inheritance.
@@ -173,7 +175,7 @@ public interface SubjectData {
      * @param value The value to set.
      * @return Whether the operation was successful
      */
-    boolean setOption(Set<Context> contexts, String key, String value);
+    boolean setOption(Set<Context> contexts, String key, @Nullable String value);
 
     /**
      * Clear all options in the given context combination.