Fixed reported Findbugs issues

1 files changed, 12 insertions, 3 deletions

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
index 660ec21..570a852 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
@@ -120,11 +120,20 @@ public class BitbucketRepository {
                     pullRequest.getDestination().getCommit().getHash(),
                     pullRequest.getAuthor().getCombinedUsername()
             );
-            setBuildStatus(cause, BuildState.INPROGRESS, Jenkins.getInstance().getRootUrl());
+            setBuildStatus(cause, BuildState.INPROGRESS, getInstance().getRootUrl());
             this.builder.getTrigger().startJob(cause);
         }
     }
 
+    private Jenkins getInstance() {
+        final Jenkins instance = Jenkins.getInstance();
+        if (instance == null){
+            throw new IllegalStateException("Jenkins instance is NULL!");
+        }
+        return instance;
+    }
+
+
     public void setBuildStatus(BitbucketCause cause, BuildState state, String buildUrl) {
         String comment = null;
         String sourceCommit = cause.getSourceCommitHash();
@@ -295,8 +304,8 @@ public class BitbucketRepository {
             sources.add(src);                
         
         BitbucketBuildFilter filter = !this.trigger.getBranchesFilterBySCMIncludes() ? 
-          BitbucketBuildFilter.InstanceByString(this.trigger.getBranchesFilter()) :
-          BitbucketBuildFilter.InstanceBySCM(sources, this.trigger.getBranchesFilter());
+          BitbucketBuildFilter.instanceByString(this.trigger.getBranchesFilter()) :
+          BitbucketBuildFilter.instanceBySCM(sources, this.trigger.getBranchesFilter());
         
         return filter.approved(cause);
     }