From 917af2401587558cbfafdccb5f057d208d35140e Mon Sep 17 00:00:00 2001 From: Jonathan Mace Date: Wed, 8 Jul 2020 11:44:00 +0200 Subject: [PATCH] Update BaggageBuffersContents.java Add bagKey null check --- .../tracingplane/baggage_buffers/BaggageBuffersContents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baggage-buffers/src/main/java/edu/brown/cs/systems/tracingplane/baggage_buffers/BaggageBuffersContents.java b/baggage-buffers/src/main/java/edu/brown/cs/systems/tracingplane/baggage_buffers/BaggageBuffersContents.java index dfd119a..cd84e58 100644 --- a/baggage-buffers/src/main/java/edu/brown/cs/systems/tracingplane/baggage_buffers/BaggageBuffersContents.java +++ b/baggage-buffers/src/main/java/edu/brown/cs/systems/tracingplane/baggage_buffers/BaggageBuffersContents.java @@ -74,7 +74,7 @@ public class BaggageBuffersContents implements BaggageContents { /** Get the value mapped to a key, or null if no mapping */ public Bag get(BagKey key) { - return bags == null ? null : bags.get(key); + return (bags == null || key == null) ? null : bags.get(key); } /** Remove the mapping for the specified key. Returns this object */