Fix for JENKINS-24999

jenkinsci · Oct 5, 2014 · c88b282 · c88b282
1 parent 059d380
commit c88b282
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,10 @@
-.idea/
+target/*
+work/*
+.settings/*
+.classpath
+.project
+.idea
 *.iml
+/target
 .DS_Store
-target
-work
+**/.DS_Store
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitBucketPushCause.java b/src/main/java/com/cloudbees/jenkins/plugins/BitBucketPushCause.java
@@ -12,6 +12,10 @@ public class BitBucketPushCause extends SCMTrigger.SCMTriggerCause {
 
     private String pushedBy;
 
+    public BitBucketPushCause(String pusher) {
+        this("", pusher);
+    }
+
     public BitBucketPushCause(String pollingLog, String pusher) {
         super(pollingLog);
         pushedBy = pusher;

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java b/src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java
@@ -20,10 +20,9 @@ public class BitBucketTrigger extends Trigger<AbstractProject> {
     public BitBucketTrigger() {
     }
 
-    public void onPost(String user, URIish repository, String sha1, String branch) {
-        for (GitStatus.Listener listener : Jenkins.getInstance().getExtensionList(GitStatus.Listener.class)) {
-            listener.onNotifyCommit(repository, sha1, new String[] { branch });
-        }
+    public void onPost(AbstractProject<?,?> job, String user) {
+    	BitBucketPushCause cause = new BitBucketPushCause(user);
+    	job.scheduleBuild(cause);	
     }
 
     @Extension

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitbucketHookReceiver.java b/src/main/java/com/cloudbees/jenkins/plugins/BitbucketHookReceiver.java
@@ -121,7 +121,7 @@ private void processPayload(JSONObject payload) {
                     BitBucketTrigger trigger = job.getTrigger(BitBucketTrigger.class);
                     if (trigger!=null) {
                         if (match(job.getScm(), remote)) {
-                            trigger.onPost(user, remote, sha1, branch);
+                        	trigger.onPost(job, user);
                         } else LOGGER.info("job SCM doesn't match remote repo");
                     } else LOGGER.info("job hasn't BitBucketTrigger set");
                 }