From 99f887f98966854f7c38a46f9d68dcc2d5da16a2 Mon Sep 17 00:00:00 2001
From: Shinsuke Nishio <nishio@densan-labs.net>
Date: Thu, 12 Feb 2015 01:59:31 +0900
Subject: Fix Bug; Raise Null pointer exception when not using Jenkins proxy

---
 .../bitbucketpullrequestbuilder/bitbucket/BitbucketApiClient.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket')

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();
-- 
cgit v1.2.3