The Unified and Autonomous Development Platform
Fix issue #1177 - Exception when deleting user
Robin Shene537874a40ee
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 771d616077..8ba3d4ae78 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -55,10 +55,14 @@ import io.onedev.server.security.permission.ConfidentialIssuePermission;import io.onedev.server.util.facade.UserCache;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.usage.Usage;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;@Singletonpublic class DefaultUserManager extends BaseEntityManager<User> implements UserManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultUserManager.class);+private final ProjectManager projectManager;private final SettingManager settingManager;@@ -152,14 +156,18 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserMpublic void delete(User user) {Usage usage = new Usage();for (Project project: projectManager.query()) {- Usage usedInProject = new Usage();- for (BranchProtection protection: project.getBranchProtections())- usedInProject.add(protection.onDeleteUser(user.getName()));- for (TagProtection protection: project.getTagProtections())- usedInProject.add(protection.onDeleteUser(user.getName()));- usedInProject.add(project.getIssueSetting().onDeleteUser(user.getName()));- usedInProject.prefix("project '" + project.getPath() + "': settings");- usage.add(usedInProject);+ try {+ Usage usedInProject = new Usage();+ for (BranchProtection protection : project.getBranchProtections())+ usedInProject.add(protection.onDeleteUser(user.getName()));+ for (TagProtection protection : project.getTagProtections())+ usedInProject.add(protection.onDeleteUser(user.getName()));+ usedInProject.add(project.getIssueSetting().onDeleteUser(user.getName()));+ usedInProject.prefix("project '" + project.getPath() + "': settings");+ usage.add(usedInProject);+ } catch (Exception e) {+ logger.error("Failed to check user reference in project: {}", project.getPath());+ }}usage.add(settingManager.onDeleteUser(user.getName()));diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.javaindex db01c235c5..aee1aee862 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java@@ -241,7 +241,7 @@ public class BranchProtection implements Serializable {break;}}- return usage.prefix("branch protection '" + getBranches() + "'");+ return usage.prefix("code: branch protection '" + getBranches() + "'");}/**diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.javaindex b7f3a3dabf..46fbd5abfc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java@@ -137,7 +137,7 @@ public class TagProtection implements Serializable {Usage usage = new Usage();if (UserMatch.isUsingUser(userMatch, userName))usage.add("applicable users");- return usage.prefix("tag protection '" + getTags() + "'");+ return usage.prefix("code: tag protection '" + getTags() + "'");}public Usage getTagUsage(String tagName) {