run custom patchers via the generic debugger patching mechanism (for the sake of Tomcat)

This commit is contained in:
peter
2010-03-26 08:47:19 +00:00
parent 436d78bfba
commit 9fbe5ff27c
2 changed files with 2 additions and 2 deletions
@@ -24,7 +24,6 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.executors.DefaultDebugExecutor;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.JavaPatchableProgramRunner;
import com.intellij.execution.runners.JavaProgramPatcher;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.history.LocalHistory;
import com.intellij.history.LocalHistoryConfiguration;
@@ -109,6 +108,7 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
public void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException {
doPatch(javaParameters, settings);
runCustomPatchers(javaParameters, settings, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultDebugExecutor.class));
}
private static RemoteConnection doPatch(final JavaParameters javaParameters, final RunnerSettings settings) throws ExecutionException {
@@ -62,6 +62,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
}
public void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException {
runCustomPatchers(javaParameters, settings, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultRunExecutor.class));
}
public void checkConfiguration(final RunnerSettings settings, final ConfigurationPerRunnerSettings configurationPerRunnerSettings)
@@ -84,7 +85,6 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
if (state instanceof JavaCommandLine) {
final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
patch(parameters, state.getRunnerSettings(), true);
runCustomPatchers(parameters, state.getRunnerSettings(), executor);
final ProcessProxy proxy = ProcessProxyFactory.getInstance().createCommandLineProxy((JavaCommandLine)state);
executionResult = state.execute(executor, this);
if (proxy != null && executionResult != null) {