Commit 015edb3

committed

Merge branch '6.2.x'

# Conflicts: # framework-platform/framework-platform.gradle

2 parents fa5ebbc + 931686a commit 015edb3Copy full SHA for 015edb3

File tree

-0

lines changed

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

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public class ResponseBodyEmitter {`
`92`	`92`	`/** Guards access to write operations on the response. */`
`93`	`93`	`protected final Lock writeLock = new ReentrantLock();`
`94`	`94`
	`95`	`+`
`95`	`96`	`/**`
`96`	`97`	`* Create a new ResponseBodyEmitter instance.`
`97`	`98`	`*/`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public class SseEmitter extends ResponseBodyEmitter {`
`45`	`45`
`46`	`46`	`private static final MediaType TEXT_PLAIN = new MediaType("text", "plain", StandardCharsets.UTF_8);`
`47`	`47`
	`48`	`+`
`48`	`49`	`/**`
`49`	`50`	`* Create a new SseEmitter instance.`
`50`	`51`	`*/`

Comments

(0)