Browse Source

Minor updates based on PR#1058

The original repo no longer exists:
https://github.com/spring-projects/spring-framework/pull/1058
pull/1553/merge
Rossen Stoyanchev 8 years ago
parent
commit
b1048975d2
  1. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
  2. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java

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

@ -228,7 +228,9 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat @@ -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

@ -162,7 +162,7 @@ public class SseEmitter extends ResponseBodyEmitter { @@ -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);

Loading…
Cancel
Save