From 55a6b4525cd9dc553777f284b5c23fb78daa9293 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Thu, 30 Apr 2026 11:50:36 -0700
Subject: [PATCH] Align @Nullable in returned Map with actual implementation

See gh-50265

Signed-off-by: Manu Sridharan <msridhar@gmail.com>

Closes gh-50265
---
 .../boot/webmvc/autoconfigure/error/BasicErrorController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/error/BasicErrorController.java b/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/error/BasicErrorController.java
index eb7be92a00f..1ab6e9041a2 100644
--- a/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/error/BasicErrorController.java
+++ b/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/error/BasicErrorController.java
@@ -95,7 +95,7 @@ public class BasicErrorController extends AbstractErrorController {
 	}
 
 	@RequestMapping
-	public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
+	public ResponseEntity<Map<String, @Nullable Object>> error(HttpServletRequest request) {
 		HttpStatus status = getStatus(request);
 		if (status == HttpStatus.NO_CONTENT) {
 			return new ResponseEntity<>(status);