From 15971ef69642634a785d7bb0b46f970b34839d15 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 4 Apr 2013 17:00:26 -0700 Subject: Check null before grabbing metadata owning plugin. Fixes BUKKIT-4665 MetadataStoreBase throws a NullPointerException when passed a null value for setMetaData. The intended behavior is to throw an IllegalArgumentException. This commit changes the value's null check to occur before referencing the owning plugin of a value. --- src/main/java/org/bukkit/metadata/MetadataStoreBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java index f46e1ec9..28f35fd1 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -25,8 +25,8 @@ public abstract class MetadataStoreBase { * @throws IllegalArgumentException If value is null, or the owning plugin is null */ public synchronized void setMetadata(T subject, String metadataKey, MetadataValue newMetadataValue) { - Plugin owningPlugin = newMetadataValue.getOwningPlugin(); Validate.notNull(newMetadataValue, "Value cannot be null"); + Plugin owningPlugin = newMetadataValue.getOwningPlugin(); Validate.notNull(owningPlugin, "Plugin cannot be null"); String key = disambiguate(subject, metadataKey); Map entry = metadataMap.get(key); -- cgit v1.2.3