/*
 * Copyright 2011 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.gradle.launcher.daemon.server.exec;

import org.gradle.api.GradleException;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
import org.gradle.initialization.GradleLauncherFactory;
import org.gradle.launcher.exec.InProcessGradleLauncherActionExecuter;
import org.gradle.launcher.daemon.logging.DaemonMessages;
import org.gradle.launcher.daemon.protocol.Build;
import org.gradle.launcher.exec.ReportedException;

/**
 * Actually executes the build.
 * 
 * Typically the last action in the pipeline.
 */
public class ExecuteBuild extends BuildCommandOnly {

    private static final Logger LOGGER = Logging.getLogger(ExecuteBuild.class);
    
    final private GradleLauncherFactory launcherFactory;

    public ExecuteBuild(GradleLauncherFactory launcherFactory) {
        this.launcherFactory = launcherFactory;
    }

    protected void doBuild(DaemonCommandExecution execution, Build build) {
        LOGGER.info("Executing build with daemon context: {}", execution.getDaemonContext());
        InProcessGradleLauncherActionExecuter executer = new InProcessGradleLauncherActionExecuter(launcherFactory);
        try {
            execution.setResult(executer.execute(build.getAction(), build.getParameters()));
        } catch (GradleException e) {
            /*
                We have to wrap in a ReportedException so the other side doesn't re-log this exception, because it's already
                been logged by the GradleLauncher infrastructure, and that logging has been shipped over to the other side.
                
                This doesn't seem right. Perhaps we should assume on the client side that all “build failures” (opposed to daemon infrastructure failures)
                have already been logged and do away with this wrapper.
            */
            execution.setException(new ReportedException(e));
        } finally {
            LOGGER.debug(DaemonMessages.FINISHED_BUILD);
        }

        execution.proceed(); // ExecuteBuild should be the last action, but in case we want to decorate the result in the future
    }

}

@@ -662,47 +662,8 @@
 c;%0A%0A
-import org.gradle.api.GradleException;%0A
 impo
@@ -692,24 +692,24 @@
 ing.Logger;%0A
+
 import org.g
@@ -795,79 +795,8 @@
 ry;%0A
-import org.gradle.launcher.exec.InProcessGradleLauncherActionExecuter;%0A
 impo
@@ -899,16 +899,87 @@
 .Build;%0A
+import org.gradle.launcher.exec.InProcessGradleLauncherActionExecuter;%0A
 import o
@@ -1840,22 +1840,24 @@
  catch (
-Gradle
+Reported
 Exceptio
@@ -2425,32 +2425,9 @@
 ion(
-new ReportedException(e)
+e
 );%0A 

Fix for changed exception handling.