From 9417295b77c5b1da8dd5454862e2998f0f03ebb1 Mon Sep 17 00:00:00 2001
From: Martin Damovsky <martin.damovsky@gmail.com>
Date: Mon, 20 Feb 2017 13:10:36 +0100
Subject: Fixed reported Findbugs issues

---
 .../bitbucketpullrequestbuilder/bitbucket/ApiClient.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
index 0c87478..7ab69c4 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
@@ -58,7 +58,7 @@ public class ApiClient {
 
             if (Jenkins.getInstance() == null) return client;
 
-            ProxyConfiguration proxy = Jenkins.getInstance().proxy;
+            ProxyConfiguration proxy = getInstance().proxy;
             if (proxy == null) return client;
 
             logger.log(Level.INFO, "Jenkins proxy: {0}:{1}", new Object[]{ proxy.name, proxy.port });
@@ -75,7 +75,17 @@ public class ApiClient {
             
             return client;
         }
+
+        private Jenkins getInstance() {
+            final Jenkins instance = Jenkins.getInstance();
+            if (instance == null){
+                throw new IllegalStateException("Jenkins instance is NULL!");
+            }
+            return instance;
+        }
     }
+
+
     
     public <T extends HttpClientFactory> ApiClient(
         String username, String password, 
-- 
cgit v1.2.3