[JENKINS-34825] Adapt the guessBrowser method to retrieve Job from St…

…apler request.
jenkinsci · Feb 16, 2017 · d71495f · d71495f
1 parent a70b9f2
commit d71495f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
   <url>https://wiki.jenkins-ci.org/display/JENKINS/P4+Plugin</url>
 
   <properties>
-    <jenkins.version>1.596.1</jenkins.version>
+    <jenkins.version>1.609</jenkins.version>
   </properties>
 
   <scm>

diff --git a/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java b/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java
@@ -55,10 +55,7 @@
 import org.jenkinsci.plugins.p4.workspace.StreamWorkspaceImpl;
 import org.jenkinsci.plugins.p4.workspace.TemplateWorkspaceImpl;
 import org.jenkinsci.plugins.p4.workspace.Workspace;
-import org.kohsuke.stapler.AncestorInPath;
-import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.*;
 
 import javax.annotation.CheckForNull;
 import java.io.File;
@@ -218,8 +215,20 @@ public RepositoryBrowser<?> guessBrowser() {
 			logger.fine("No credential for perforce");
 			return null;
 		}
+		StaplerRequest req = Stapler.getCurrentRequest();
+		if (req == null) {
+			logger.fine("Unable to retrieve job from request");
+			return null;
+		}
+
+		Job job = req.findAncestorObject(Job.class);
+		if (req == null) {
+			logger.fine("Unable to retrieve job");
+			return null;
+		}
+
 		try {
-			ConnectionHelper connection = new ConnectionHelper(scmCredential, null);
+			ConnectionHelper connection = new ConnectionHelper(job, scmCredential, null);
 			String swarm = connection.getSwarm();
 			URL url = new URL(swarm);
 			return new SwarmBrowser(url);