Ensure null values work

markushi · markushi · commit 3cc7514a4275 · 2025-04-14T13:43:32.000+02:00
diff --git a/sentry/src/main/java/io/sentry/Baggage.java b/sentry/src/main/java/io/sentry/Baggage.java
@@ -457,7 +457,11 @@ public void setReplayId(final @Nullable String replayId) {
   @ApiStatus.Internal
   public void set(final @NotNull String key, final @Nullable String value) {
     if (mutable) {
-      this.keyValues.put(key, value);
+      if (value == null) {
+        keyValues.remove(key);
+      } else {
+        keyValues.put(key, value);
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,11 @@ public void setReplayId(final @Nullable String replayId) {`
`457`	`457`	`@ApiStatus.Internal`
`458`	`458`	`public void set(final @NotNull String key, final @Nullable String value) {`
`459`	`459`	`if (mutable) {`
`460`		`- this.keyValues.put(key, value);`
	`460`	`+ if (value == null) {`
	`461`	`+ keyValues.remove(key);`
	`462`	`+ } else {`
	`463`	`+ keyValues.put(key, value);`
	`464`	`+ }`
`461`	`465`	`}`
`462`	`466`	`}`
`463`	`467`