From e98dc50f994708beb3bab2065336a6ec23fa1332 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 15 Oct 2012 09:41:23 -0400
Subject: [PATCH] Fix issue in PatternsRequestCondition

---
 .../mvc/condition/PatternsRequestCondition.java  |  5 ++++-
 .../condition/PatternsRequestConditionTests.java | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index 10743bb230..357e31fe36 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -111,7 +111,10 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 		this.useTrailingSlashMatch = useTrailingSlashMatch;
 		if (fileExtensions != null) {
 			for (String fileExtension : fileExtensions) {
-				this.fileExtensions.add("." + fileExtension);
+				if (fileExtension.charAt(0) != '.') {
+					fileExtension = "." + fileExtension;
+				}
+				this.fileExtensions.add(fileExtension);
 			}
 		}
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
index bd276ab398..3b67c80829 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
@@ -138,6 +138,22 @@ public class PatternsRequestConditionTests {
 		assertEquals("/jobs/{jobName}.json", match.getPatterns().iterator().next());
 	}
 
+	@Test
+	public void matchSuffixPatternUsingFileExtensions2() {
+		PatternsRequestCondition condition1 = new PatternsRequestCondition(
+				new String[] {"/prefix"}, null, null, true, false, Arrays.asList("json"));
+
+		PatternsRequestCondition condition2 = new PatternsRequestCondition(
+				new String[] {"/suffix"}, null, null, true, false, null);
+
+		PatternsRequestCondition combined = condition1.combine(condition2);
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/prefix/suffix.json");
+		PatternsRequestCondition match = combined.getMatchingCondition(request);
+
+		assertNotNull(match);
+	}
+
 	@Test
 	public void matchTrailingSlash() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo/");