Merge branch 'stable-3.1' into stable-3.2
* stable-3.1:
Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API
Use username from notedb in serviceuser.db
Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API
Change-Id: Id179a6b1f1778c8f6a99fd78d6a08b5456763b34
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java
index 296ffef..3e04e41 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java
@@ -174,11 +174,11 @@
try {
Config db = storage.get();
- db.setInt(USER, username, KEY_CREATOR_ID, creatorId.get());
+ db.setInt(USER, response.username, KEY_CREATOR_ID, creatorId.get());
if (creator != null) {
- db.setString(USER, username, KEY_CREATED_BY, creator);
+ db.setString(USER, response.username, KEY_CREATED_BY, creator);
}
- db.setString(USER, username, KEY_CREATED_AT, creationDate);
+ db.setString(USER, response.username, KEY_CREATED_AT, creationDate);
MetaDataUpdate md = metaDataUpdateFactory.create(allProjects);
md.setMessage("Create service user '" + username + "'\n");