Skip to content

The Unified and Autonomous Development Platform

Fix possible NPE when release agent resources

Robin Shen8a64f246bdfb
diff --git a/server-core/src/main/java/io/onedev/server/ServerSocket.java b/server-core/src/main/java/io/onedev/server/ServerSocket.java
index 6dacd7d042..0a437e4449 100644
--- a/server-core/src/main/java/io/onedev/server/ServerSocket.java
+++ b/server-core/src/main/java/io/onedev/server/ServerSocket.java
@@ -189,7 +189,8 @@ public class ServerSocket {
private Serializable service(Serializable request) {
try {
if (request instanceof WaitingForAgentResourceToBeReleased) {
- OneDev.getInstance(ResourceAllocator.class).waitingForAgentResourceToBeReleased(agentId);
+ if (agentId != null)
+ OneDev.getInstance(ResourceAllocator.class).waitingForAgentResourceToBeReleased(agentId);
return null;
} else {
throw new ExplicitException("Unknown request: " + request.getClass());