root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor updates based on PR#1058 

The original repo no longer exists:
https://github.com/spring-projects/spring-framework/pull/1058
This commit is contained in:
Rossen Stoyanchev 2018-03-30 13:35:41 -04:00
parent d232fffa63
commit b1048975d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
View File

@ -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;
}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
View File

@ -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);