commit aa07963def69e4423444a078a662072e09629cec
author David Pursehouse <dpursehouse@collab.net> Tue May 07 13:23:22 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue May 07 13:23:22 2019 +0900
tree cdcb65229a59a0f340c0fd3aa8524a0cfe55cd62
parent 486e6f0dec5cf7981e750d79cda940314e67ff99
parent 1c82d0a26c43eefd1f37c1428e92ca80ea9a8be0

Merge branch 'stable-3.0'

* stable-3.0:
  Fix NPE when username or password isn't specified for remote

Change-Id: If401394e72cfccdb36bc85b6842c5f657bbf4056

src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java b/src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java
index e511b92..18a4cc2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java
@@ -17,6 +17,7 @@
 import com.google.gerrit.server.config.SitePaths;
 import com.google.inject.Inject;
 import java.io.IOException;
+import java.util.Objects;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
@@ -51,8 +52,8 @@
 
   @Override
   public CredentialsProvider create(String remoteName) {
-    String user = config.getString("remote", remoteName, "username");
-    String pass = config.getString("remote", remoteName, "password");
+    String user = Objects.toString(config.getString("remote", remoteName, "username"), "");
+    String pass = Objects.toString(config.getString("remote", remoteName, "password"), "");
     return new UsernamePasswordCredentialsProvider(user, pass);
   }
 }