From 4fc0ce120628490922ae1392c2ab96a69d02d2d7 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Tue, 1 Aug 2017 12:52:28 +0200
Subject: [PATCH] Properly detect null value params in params conditions

Issue: SPR-15831
---
 .../condition/ParamsRequestConditionTests.java   |  6 ++++++
 .../mvc/condition/ParamsRequestCondition.java    |  3 ++-
 .../condition/ParamsRequestConditionTests.java   | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
index 79fcb2cf85c..ca4d6a7f781 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
@@ -51,6 +51,12 @@ public class ParamsRequestConditionTests {
 		assertNotNull(condition.getMatchingCondition(get("/path?foo=").toExchange()));
 	}
 
+	@Test // SPR-15831
+	public void paramPresentNullValue() throws Exception {
+		ParamsRequestCondition condition = new ParamsRequestCondition("foo");
+		assertNotNull(condition.getMatchingCondition(get("/path?foo").toExchange()));
+	}
+
 	@Test
 	public void paramPresentNoMatch() throws Exception {
 		ParamsRequestCondition condition = new ParamsRequestCondition("foo");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index aa9bcf3fe00..ea4eda80808 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -142,7 +142,8 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 
 		@Override
 		protected boolean matchName(HttpServletRequest request) {
-			return WebUtils.hasSubmitParameter(request, this.name);
+			return WebUtils.hasSubmitParameter(request, this.name) ||
+					request.getParameterMap().containsKey(this.name);
 		}
 
 		@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
index 728ca087291..561f5b40f70 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,11 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition.ParamExpression;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link ParamsRequestCondition}.
@@ -48,6 +52,14 @@ public class ParamsRequestConditionTests {
 		assertNotNull(new ParamsRequestCondition("foo").getMatchingCondition(request));
 	}
 
+	@Test // SPR-15831
+	public void paramPresentNullValue() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("foo", (String) null);
+
+		assertNotNull(new ParamsRequestCondition("foo").getMatchingCondition(request));
+	}
+
 	@Test
 	public void paramPresentNoMatch() {
 		MockHttpServletRequest request = new MockHttpServletRequest();