diff options
author | S.Nishio <nishio@densan-labs.net> | 2015-02-12 02:02:07 +0900 |
---|---|---|
committer | S.Nishio <nishio@densan-labs.net> | 2015-02-12 02:02:07 +0900 |
commit | aa276f01f37a557115220aaf3b65de2d102d23d0 (patch) | |
tree | ade886ec193ecfdcba4b3969cd77c4fa5de37657 | |
parent | 96e6eded31e6bfdcb2b4845086daff77c733a0be (diff) | |
parent | 99f887f98966854f7c38a46f9d68dcc2d5da16a2 (diff) | |
download | bbprb-aa276f01f37a557115220aaf3b65de2d102d23d0.tar.gz |
Merge pull request #40 from nishio-dens/proxy_not_work
Fix Bug; Raise Null pointer exception when not using Jenkins proxy
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java index 8bd1b03..b6d3155 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java @@ -84,8 +84,8 @@ public class BitbucketApiClient { HttpClient client = new HttpClient(); if (Jenkins.getInstance() != null) { ProxyConfiguration proxy = Jenkins.getInstance().proxy; - logger.info("Jenins proxy: " + proxy.name + ":" + proxy.port); if (proxy != null) { + logger.info("Jenkins proxy: " + proxy.name + ":" + proxy.port); client.getHostConfiguration().setProxy(proxy.name, proxy.port); String username = proxy.getUserName(); String password = proxy.getPassword(); |