From fba43bf5fbb27607cbfe784f64319d8a7ea71017 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 25 May 2012 18:42:15 -0700
Subject: [PATCH] reverting access modifiers

---
 .../main/java/hudson/matrix/MatrixBuild.java  |  5 +----
 .../main/java/hudson/matrix/MatrixRun.java    | 21 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java
index 287e8f435c..fe40953123 100644
--- a/core/src/main/java/hudson/matrix/MatrixBuild.java
+++ b/core/src/main/java/hudson/matrix/MatrixBuild.java
@@ -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 {
diff --git a/core/src/main/java/hudson/matrix/MatrixRun.java b/core/src/main/java/hudson/matrix/MatrixRun.java
index bc42b441c0..0f56d9d13f 100644
--- a/core/src/main/java/hudson/matrix/MatrixRun.java
+++ b/core/src/main/java/hudson/matrix/MatrixRun.java
@@ -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();