Merge branch 'stable-3.2' into stable-3.3
* stable-3.2:
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: Ia046a448890d5e8220fb67144e00c284bd7d62ed
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 d7cdff8..c3b5add 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/CreateServiceUser.java
@@ -177,11 +177,11 @@
update.load(md);
Config db = update.getConfig();
- 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);
md.setMessage("Create service user '" + username + "'\n");
update.commit(md);