From b1048975d2966b5c5ab3315403c4e5f0c736bc4d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 30 Mar 2018 13:35:41 -0400
Subject: [PATCH] Minor updates based on PR#1058

The original repo no longer exists:
https://github.com/spring-projects/spring-framework/pull/1058
---
 .../web/servlet/mvc/condition/PatternsRequestCondition.java   | 4 +++-
 .../web/servlet/mvc/method/annotation/SseEmitter.java         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 4b02317bd07..71fd4a7a1eb 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
@@ -228,7 +228,9 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 				matches.add(match);
 			}
 		}
-		matches.sort(this.pathMatcher.getPatternComparator(lookupPath));
+		if (matches.size() > 1) {
+			matches.sort(this.pathMatcher.getPatternComparator(lookupPath));
+		}
 		return matches;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
index ec1d5ea3bf1..df665ce73b9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
@@ -162,7 +162,7 @@ public class SseEmitter extends ResponseBodyEmitter {
 		SseEventBuilder name(String eventName);
 
 		/**
-		 * Add an SSE "event" line.
+		 * Add an SSE "retry" line.
 		 */
 		SseEventBuilder reconnectTime(long reconnectTimeMillis);