1 files changed, 14 insertions, 6 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java
index 005904c269..02ed991ad7 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java
@@ -126,7 +126,7 @@ class Section {
   }
 
   String password(final String username, final String password) {
-    final String ov = flags.sec.getString(section, null, password);
+    final String ov = getSecure(password);
 
     String user = flags.sec.getString(section, null, username);
     if (user == null) {
@@ -149,15 +149,23 @@ class Section {
 
     final String nv = ui.password("%s's password", user);
     if (!eq(ov, nv)) {
-      if (nv != null) {
-        flags.sec.setString(section, null, password, nv);
-      } else {
-        flags.sec.unset(section, null, password);
-      }
+      setSecure(password, nv);
     }
     return nv;
   }
 
+  String getSecure(String name) {
+    return flags.sec.getString(section, null, name);
+  }
+
+  void setSecure(String name, String value) {
+    if (value != null) {
+      flags.sec.setString(section, null, name, value);
+    } else {
+      flags.sec.unset(section, null, name);
+    }
+  }
+
   private static boolean eq(final String a, final String b) {
     if (a == null && b == null) {
       return true;