Merge branch '6.2.x'

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

@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 
 import org.jspecify.annotations.Nullable;
@@ -63,6 +65,7 @@ import org.springframework.util.ObjectUtils;
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
  * @author Brian Clozel
+ * @author Taeik Lim
  * @since 4.2
  */
 public class ResponseBodyEmitter {
@@ -86,6 +89,8 @@ public class ResponseBodyEmitter {
 
 	private final DefaultCallback completionCallback = new DefaultCallback();
 
+	/** Guards access to write operations on the response. */
+	protected final Lock writeLock = new ReentrantLock();
 
 	/**
 	 * Create a new ResponseBodyEmitter instance.
@@ -114,7 +119,9 @@ public class ResponseBodyEmitter {
 	}
 
 
-	synchronized void initialize(Handler handler) throws IOException {
+	void initialize(Handler handler) throws IOException {
+		this.writeLock.lock();
+		try {
 			this.handler = handler;
 
 			try {
@@ -138,13 +145,23 @@ public class ResponseBodyEmitter {
 				this.handler.onCompletion(this.completionCallback);
 			}
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
-	synchronized void initializeWithError(Throwable ex) {
+	void initializeWithError(Throwable ex) {
+		this.writeLock.lock();
+		try {
 			this.complete = true;
 			this.failure = ex;
 			this.earlySendAttempts.clear();
 			this.errorCallback.accept(ex);
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Invoked after the response is updated with the status code and headers,
@@ -180,9 +197,11 @@ public class ResponseBodyEmitter {
 	 * @throws IOException raised when an I/O error occurs
 	 * @throws java.lang.IllegalStateException wraps any other errors
 	 */
-	public synchronized void send(Object object, @Nullable MediaType mediaType) throws IOException {
+	public void send(Object object, @Nullable MediaType mediaType) throws IOException {
 		Assert.state(!this.complete, () -> "ResponseBodyEmitter has already completed" +
 				(this.failure != null ? " with error: " + this.failure : ""));
+		this.writeLock.lock();
+		try {
 			if (this.handler != null) {
 				try {
 					this.handler.send(object, mediaType);
@@ -198,6 +217,10 @@ public class ResponseBodyEmitter {
 				this.earlySendAttempts.add(new DataWithMediaType(object, mediaType));
 			}
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Write a set of data and MediaType pairs in a batch.
@@ -208,11 +231,17 @@ public class ResponseBodyEmitter {
 	 * @throws java.lang.IllegalStateException wraps any other errors
 	 * @since 6.0.12
 	 */
-	public synchronized void send(Set<DataWithMediaType> items) throws IOException {
+	public void send(Set<DataWithMediaType> items) throws IOException {
 		Assert.state(!this.complete, () -> "ResponseBodyEmitter has already completed" +
 				(this.failure != null ? " with error: " + this.failure : ""));
+		this.writeLock.lock();
+		try {
 			sendInternal(items);
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	private void sendInternal(Set<DataWithMediaType> items) throws IOException {
 		if (items.isEmpty()) {
@@ -242,12 +271,18 @@ public class ResponseBodyEmitter {
 	 * to complete request processing. It should not be used after container
 	 * related events such as an error while {@link #send(Object) sending}.
 	 */
-	public synchronized void complete() {
+	public void complete() {
+		this.writeLock.lock();
+		try {
 			this.complete = true;
 			if (this.handler != null) {
 				this.handler.complete();
 			}
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Complete request processing with an error.
@@ -260,22 +295,34 @@ public class ResponseBodyEmitter {
 	 * container related events such as an error while
 	 * {@link #send(Object) sending}.
 	 */
-	public synchronized void completeWithError(Throwable ex) {
+	public void completeWithError(Throwable ex) {
+		this.writeLock.lock();
+		try {
 			this.complete = true;
 			this.failure = ex;
 			if (this.handler != null) {
 				this.handler.completeWithError(ex);
 			}
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Register code to invoke when the async request times out. This method is
 	 * called from a container thread when an async request times out.
 	 * <p>As of 6.2, one can register multiple callbacks for this event.
 	 */
-	public synchronized void onTimeout(Runnable callback) {
+	public void onTimeout(Runnable callback) {
+		this.writeLock.lock();
+		try {
 			this.timeoutCallback.addDelegate(callback);
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Register code to invoke for an error during async request processing.
@@ -284,9 +331,15 @@ public class ResponseBodyEmitter {
 	 * <p>As of 6.2, one can register multiple callbacks for this event.
 	 * @since 5.0
 	 */
-	public synchronized void onError(Consumer<Throwable> callback) {
+	public void onError(Consumer<Throwable> callback) {
+		this.writeLock.lock();
+		try {
 			this.errorCallback.addDelegate(callback);
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 	/**
 	 * Register code to invoke when the async request completes. This method is
@@ -295,9 +348,15 @@ public class ResponseBodyEmitter {
 	 * detecting that a {@code ResponseBodyEmitter} instance is no longer usable.
 	 * <p>As of 6.2, one can register multiple callbacks for this event.
 	 */
-	public synchronized void onCompletion(Runnable callback) {
+	public void onCompletion(Runnable callback) {
+		this.writeLock.lock();
+		try {
 			this.completionCallback.addDelegate(callback);
 		}
+		finally {
+			this.writeLock.unlock();
+		}
+	}
 
 
 	@Override

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

@@ -21,8 +21,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.jspecify.annotations.Nullable;
 
@@ -47,10 +45,6 @@ public class SseEmitter extends ResponseBodyEmitter {
 
 	private static final MediaType TEXT_PLAIN = new MediaType("text", "plain", StandardCharsets.UTF_8);
 
-	/** Guards access to write operations on the response. */
-	private final Lock writeLock = new ReentrantLock();
-
-
 	/**
 	 * Create a new SseEmitter instance.
 	 */