From cc0c2fd2fee5fe4931540172f2a3e3556604f97c Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 7 Apr 2020 10:32:01 -0400
Subject: [PATCH] GH-3241: Fix Sonar issue

---
 .../integration/selector/MetadataStoreSelector.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java
index eac404647d..efcc998fc5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java
@@ -123,7 +123,7 @@ public class MetadataStoreSelector implements MessageSelector {
 				if (oldValue == null) {
 					return this.metadataStore.putIfAbsent(key, value) == null;
 				}
-				if (this.compareValues.test(oldValue, value)) {
+				if (this.compareValues.test(oldValue, value)) { // NOSONAR (null dereference)
 					return this.metadataStore.replace(key, oldValue, value);
 				}
 				return false;