diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-05-07 13:09:31 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-05-07 13:09:31 +0900 |
commit | 1c82d0a26c43eefd1f37c1428e92ca80ea9a8be0 (patch) | |
tree | f87984ca578c647d61b6c01fa5a93151e5051b6d | |
parent | 6a4105d7f3dc09fe2eb7cb15901178eab7723a44 (diff) | |
parent | 18857e12579d841693c2dc39e9ee330ab36bca65 (diff) |
Merge branch 'stable-2.16' into stable-3.0v3.0.0-rc3
* stable-2.16:
Fix NPE when username or password isn't specified for remote
Change-Id: I30150b8eebef71b17285591c1f0db4521c1fe4d7
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/SecureCredentialsFactory.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ package com.googlesource.gerrit.plugins.replication; 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 @@ class SecureCredentialsFactory implements CredentialsFactory { @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); } } |