Fix NullPointerException in McpToolUtils.toAsyncToolSpecification

markpollack · Willam2004 · commit acea409cc6a3 · 2025-10-10T11:59:00.000+08:00
The SyncToolSpecification constructor was being called with null for the
call parameter, causing NPE when async version called call().apply().
Fixed by providing proper lambda that wraps Map arguments in CallToolRequest.

Signed-off-by: mark.pollack@broadcom.com
Signed-off-by: 家娃 &lt;guanjing.pangj@alibaba-inc.com&gt;
diff --git a/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java b/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java
@@ -165,7 +165,9 @@ public static McpServerFeatures.SyncToolSpecification toSyncToolSpecification(To
 
 		SharedSyncToolSpecification sharedSpec = toSharedSyncToolSpecification(toolCallback, mimeType);
 
-		return new McpServerFeatures.SyncToolSpecification(sharedSpec.tool(), null,
+		return new McpServerFeatures.SyncToolSpecification(sharedSpec.tool(),
+				(exchange, map) -> sharedSpec.sharedHandler()
+					.apply(exchange, new CallToolRequest(sharedSpec.tool().name(), map)),
 				(exchange, request) -> sharedSpec.sharedHandler().apply(exchange, request));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,9 @@ public static McpServerFeatures.SyncToolSpecification toSyncToolSpecification(To`
`165`	`165`
`166`	`166`	`SharedSyncToolSpecification sharedSpec = toSharedSyncToolSpecification(toolCallback, mimeType);`
`167`	`167`
`168`		`- return new McpServerFeatures.SyncToolSpecification(sharedSpec.tool(), null,`
	`168`	`+ return new McpServerFeatures.SyncToolSpecification(sharedSpec.tool(),`
	`169`	`+ (exchange, map) -> sharedSpec.sharedHandler()`
	`170`	`+ .apply(exchange, new CallToolRequest(sharedSpec.tool().name(), map)),`
`169`	`171`	`(exchange, request) -> sharedSpec.sharedHandler().apply(exchange, request));`
`170`	`172`	`}`
`171`	`173`