Skip to content

The Unified and Autonomous Development Platform

fix: NPE when push a tag containing scheduled build spec job (OD-2359)

Robin Shenf11dbc91d81f
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 3694f07eaf..3d4c131bbc 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -1135,8 +1135,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Listen
public void on(RefUpdated event) {
String branch = GitUtils.ref2branch(event.getRefName());
- Project project = event.getProject();
- cacheBranchSchedules(project, branch, event.getNewCommitId());
+ if (branch != null) {
+ Project project = event.getProject();
+ cacheBranchSchedules(project, branch, event.getNewCommitId());
+ }
}
@Listen
diff --git a/server-ee b/server-ee
index 6c6de00b9b..eaca7edb30 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 6c6de00b9bd8b146b5b4ca7d47fd062bd81c7063
+Subproject commit eaca7edb30ee6ecd32720a7e9a065c295a2602f9