diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java index 6707b6ab5010..566719bce954 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -108,6 +108,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { if (consoleComponent != null) { controlBreakAction.registerCustomShortcutSet(controlBreakAction.getShortcutSet(), consoleComponent); final ProcessHandler processHandler = executionResult.getProcessHandler(); + assert processHandler != null : executionResult; processHandler.addProcessListener(new ProcessAdapter() { public void processTerminated(final ProcessEvent event) { processHandler.removeProcessListener(this); diff --git a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java index e236c63676ec..1251e87e2f67 100644 --- a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java +++ b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ public class DefaultExecutionResult implements ExecutionResult { private AnAction[] myRestartActions; private final List myStopActions = new ArrayList(); - public DefaultExecutionResult(final ExecutionConsole console, final ProcessHandler processHandler) { + public DefaultExecutionResult(final ExecutionConsole console, @NotNull final ProcessHandler processHandler) { this(console, processHandler, AnAction.EMPTY_ARRAY); } - public DefaultExecutionResult(final ExecutionConsole console, final ProcessHandler processHandler, final AnAction... actions) { + public DefaultExecutionResult(final ExecutionConsole console, @NotNull final ProcessHandler processHandler, final AnAction... actions) { myConsole = console; myProcessHandler = processHandler; myActions = actions;