* @since 1.305
     */
    public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException {
<<<<<<< HEAD
        EnvVars env = getCharacteristicEnvVars();
        Computer c = Computer.currentComputer();
        if (c!=null)
            env = c.getEnvironment().overrideAll(env);
=======
        Computer currentComputer = Computer.currentComputer();
        EnvVars env = new EnvVars();
        if (currentComputer != null) {
        	// currentComputer == null when this is called outside a running build
        	env.overrideAll(currentComputer.getEnvironment());;
        }
        env.overrideAll(getCharacteristicEnvVars());
>>>>>>> 55b7d2549cd303d813671a0002bb8099b71442a4
        String rootUrl = Hudson.getInstance().getRootUrl();
        if(rootUrl!=null) {
            env.put("HUDSON_URL", rootUrl);

     * @since 1.305
     */
    public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException {
        EnvVars env = getCharacteristicEnvVars();
        Computer c = Computer.currentComputer();
        if (c!=null)
            env = c.getEnvironment().overrideAll(env);
        String rootUrl = Hudson.getInstance().getRootUrl();
        if(rootUrl!=null) {
            env.put("HUDSON_URL", rootUrl);