OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-06 08:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverting access modifiers

Browse Source
This commit is contained in:
Kohsuke Kawaguchi committed 2012-05-25 18:42:15 -07:00
1 parent 4a6aa4a1b4
commit fba43bf5fb
2 files changed
+4 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/matrix/MatrixBuild.java
+1 -4
View File
@@ -37,9 +37,6 @@ import hudson.model.Queue;
import hudson.model.Result;
import hudson.util.HttpResponses;
import jenkins.model.Jenkins;
import jenkins.scm.DefaultSCMCheckoutStrategyImpl;
import jenkins.scm.SCMCheckoutStrategy;
import jenkins.scm.SCMCheckoutStrategy;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@@ -287,7 +284,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
return rs;
}
/*package*/ class RunnerImpl extends AbstractRunner {
private class RunnerImpl extends AbstractRunner {
private final List<MatrixAggregator> aggregators = new ArrayList<MatrixAggregator>();
protected Result doRun(BuildListener listener) throws Exception {
core/src/main/java/hudson/matrix/MatrixRun.java
+3 -18
View File
@@ -26,15 +26,10 @@ package hudson.matrix;
import hudson.EnvVars;
import hudson.FilePath;
import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
import hudson.model.Result;
import hudson.slaves.WorkspaceList;
import hudson.slaves.WorkspaceList.Lease;
import hudson.model.Build;
import hudson.model.Node;
import jenkins.scm.DefaultSCMCheckoutStrategyImpl;
import jenkins.scm.DefaultSCMCheckoutStrategyImpl;
import jenkins.scm.SCMCheckoutStrategy;
import hudson.slaves.WorkspaceList;
import hudson.slaves.WorkspaceList.Lease;
import org.kohsuke.stapler.Ancestor;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
@@ -151,17 +146,7 @@ public class MatrixRun extends Build<MatrixConfiguration,MatrixRun> {
run(new RunnerImpl());
}
protected class RunnerImpl extends Build<MatrixConfiguration,MatrixRun>.RunnerImpl {
@Override
public Result run(BuildListener listener) throws Exception {
runner = this;
try {
return super.run(listener);
} finally {
runner = null;
}
}
private class RunnerImpl extends Build<MatrixConfiguration,MatrixRun>.RunnerImpl {
protected Lease getParentWorkspaceLease(Node n, WorkspaceList wsl) throws InterruptedException, IOException {
MatrixProject mp = getParent().getParent();