commit a7f04b4f1b306219e30582ac8e44bba7fd47b34b
author Martin Fick <mfick@codeaurora.org> Tue May 14 13:15:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 14 13:15:22 2013 +0000
tree 7010dc020d96fb43b70a927783cf00c06a29f07c
parent d0e7b198abf0b5d09944f25b8f4c38a86c2a1764
parent 17c051d9cd03dc22a83c6c74553e63109ba153c6

Merge "Improve explanation of path conflicts in project config doc" into stable-2.6

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
index ac3e728..20034c1 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
@@ -21,10 +21,11 @@
 class JDBCInitializer implements DatabaseConfigInitializer {
   @Override
   public void initConfig(Section database) {
+    boolean hasUrl = Strings.emptyToNull(database.get("url")) != null;
     database.string("URL", "url", null);
     guessDriver(database);
     database.string("Driver class name", "driver", null);
-    database.string("Database username", "username", username());
+    database.string("Database username", "username", hasUrl ? null : username());
     database.password("username", "password");
   }