Skip to content

The Unified and Autonomous Development Platform

Fix resource manager NPE error upon next start of OneDev

Robin Shena7073f324c56
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 86dc882c67..fcde74696d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -979,7 +979,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
@Sessional
- @Listen
+ @Listen(100000)
public void on(SystemStarted event) {
thread = new Thread(this);
thread.start();
diff --git a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
index 068483570e..e8c26f1354 100644
--- a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
@@ -61,7 +61,7 @@ public class DefaultResourceManager implements ResourceManager {
@SuppressWarnings("unchecked")
@Transactional
- @Listen
+ @Listen(10)
public synchronized void on(SystemStarted event) {
Map<String, Integer> resources = new HashMap<>();
resources.put(ResourceHolder.CPU,