promoted the method up the inheritance chain.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3757 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/AbstractBuild.java

@@ -3,9 +3,11 @@ package hudson.model;
 import hudson.Launcher;
 import hudson.Proc.LocalProc;
 import hudson.Util;
+import hudson.matrix.MatrixConfiguration;
 import org.kohsuke.stapler.export.Exported;
 import hudson.tasks.Fingerprinter.FingerprintAction;
 import hudson.tasks.test.AbstractTestResultAction;
+import hudson.tasks.Builder;
 import hudson.maven.MavenBuild;
 import static hudson.model.Hudson.isWindows;
 import hudson.model.listeners.SCMListener;
@@ -112,7 +114,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         }
 
         public Result run(BuildListener listener) throws Exception {
-            Node node = Executor.currentExecutor().getOwner().getNode();
+            Node node = getCurrentNode();
             assert builtOn==null;
             builtOn = node.getNodeName();
             hudsonVersion = Hudson.VERSION;
@@ -235,6 +237,21 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         return timestamp;
     }
 
+    /**
+     * Provides additional variables and their values to {@link Builder}s.
+     *
+     * <p>
+     * This mechanism is used by {@link MatrixConfiguration} to pass
+     * the configuration values to the current build. It is up to
+     * {@link Builder}s to decide whether it wants to recognize the values
+     * or how to use them.
+     *
+     * ugly ugly hack.
+     */
+    public Map<String,String> getBuildVariables() {
+        return Collections.emptyMap();
+    }
+    
     /**
      * Gets {@link AbstractTestResultAction} associated with this build if any.
      */

core/src/main/java/hudson/model/Build.java

 package hudson.model;
 
-import hudson.matrix.MatrixConfiguration;
 import hudson.tasks.BuildStep;
 import hudson.tasks.BuildWrapper;
 import hudson.tasks.BuildWrapper.Environment;
@@ -13,7 +12,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
@@ -95,21 +93,6 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
         return env;
     }
 
-    /**
-     * Provides additional variables and their values to {@link Builder}s.
-     *
-     * <p>
-     * This mechanism is used by {@link MatrixConfiguration} to pass
-     * the configuration values to the current build. It is up to
-     * {@link Builder}s to decide whether it wants to recognize the values
-     * or how to use them.
-     *
-     * ugly ugly hack.
-     */
-    public Map<String,String> getBuildVariables() {
-        return Collections.emptyMap();
-    }
-
     public Api getApi(final StaplerRequest req) {
         return new Api(this);
     }