The Unified and Autonomous Development Platform
fix: Deleting a project sometimes reports "active server not found" (#1800)
Robin Shen344581b3d503
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 87cfcca693..d79228b865 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -107,7 +107,6 @@ import java.util.concurrent.Future;import java.util.concurrent.locks.Lock;import java.util.function.Consumer;-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static io.onedev.commons.utils.FileUtils.cleanDir;import static io.onedev.commons.utils.LockUtils.read;import static io.onedev.k8shelper.KubernetesHelper.BEARER;@@ -117,6 +116,7 @@ import static io.onedev.server.model.Project.*;import static io.onedev.server.replica.ProjectReplica.Type.*;import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;import static io.onedev.server.util.DirectoryVersionUtils.*;+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static io.onedev.server.util.criteria.Criteria.forManyValues;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.Comparator.naturalOrder;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 6fdb019435..44ef5cb72e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -1061,7 +1061,7 @@ public class ProjectListPanel extends Panel {fragment.add(new EntityLabelsPanel<>("labels", rowModel));- if (project.getActiveServer(false) != null) {+ if (!project.isPendingDelete() && project.getActiveServer(false) != null) {if (project.isCodeManagement() && SecurityUtils.canReadCode(project)) {fragment.add(new CodeStatsPanel("codeStats", rowModel));fragment.add(new PullRequestStatsPanel("pullRequestStats", rowModel,