From 7f1bb28e9a3c8289dd975283f7c5ba7cd8ca864e Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Mon, 2 Dec 2013 10:30:01 -0800 Subject: [PATCH] Fix Schema_86 to use correct UUID for Change Owner group The constant UUID must be used, not a generated UUID. Change-Id: I83e330b999f32794fa051f6325528962a9a8e9fd --- .../main/java/com/google/gerrit/server/schema/Schema_86.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java index bf5dd7c3da..b066e2b59c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroupName; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.GerritPersonIdent; -import com.google.gerrit.server.account.GroupUUID; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; @@ -87,8 +86,8 @@ public class Schema_86 extends SchemaVersion { AccountGroup.UUID adminGroupUUID, String description) throws OrmException { AccountGroup.Id groupId = new AccountGroup.Id(db.nextAccountGroupId()); AccountGroup.NameKey nameKey = new AccountGroup.NameKey(groupName); - AccountGroup.UUID uuid = GroupUUID.make(groupName, serverUser); - AccountGroup group = new AccountGroup(nameKey, groupId, uuid); + AccountGroup group = + new AccountGroup(nameKey, groupId, AccountGroup.CHANGE_OWNER); group.setOwnerGroupUUID(adminGroupUUID); group.setDescription(description); group.setType(AccountGroup.Type.SYSTEM);