MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-57782 IDEA-231585 Application servers could not be started (fix NPE)

Browse Source 
GitOrigin-RevId: 89632b62d34afe2a50d891bc35c85a9e11a56e74
This commit is contained in:
Vladimir Krivosheev
2020-01-28 13:38:07 +00:00
committed by intellij-monorepo-bot
parent 80c5b0c429
commit 744eddf6e1
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+4 -2
View File
@@ -29,6 +29,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.concurrency.Promises;
import java.util.Objects;
public class GenericDebuggerRunner implements JvmPatchableProgramRunner<GenericDebuggerRunnerSettings> {
@Override
public boolean canRun(@NotNull final String executorId, @NotNull final RunProfile profile) {
@@ -159,8 +161,8 @@ public class GenericDebuggerRunner implements JvmPatchableProgramRunner<GenericD
// used externally
@Override
public void patch(@NotNull JavaParameters javaParameters, @NotNull RunnerSettings settings, @NotNull RunProfile runProfile, boolean beforeExecution) throws ExecutionException {
doPatch(javaParameters, settings, beforeExecution);
public void patch(@NotNull JavaParameters javaParameters, @Nullable RunnerSettings settings, @NotNull RunProfile runProfile, boolean beforeExecution) throws ExecutionException {
doPatch(javaParameters, Objects.requireNonNull(settings), beforeExecution);
JavaProgramPatcher.runCustomPatchers(javaParameters, Executor.EXECUTOR_EXTENSION_NAME.findExtensionOrFail(DefaultDebugExecutor.class), runProfile);
}
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+2 -1
View File
@@ -47,6 +47,7 @@ import com.intellij.xdebugger.XDebuggerManagerListener;
import com.sun.tools.attach.AttachNotSupportedException;
import com.sun.tools.attach.VirtualMachine;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.event.InputEvent;
@@ -91,7 +92,7 @@ public class DefaultJavaProgramRunner implements JvmPatchableProgramRunner<Runne
// cannot be final - overridden in YourKit plugin
@Override
public void patch(@NotNull JavaParameters javaParameters, @NotNull RunnerSettings settings, @NotNull RunProfile runProfile, boolean beforeExecution) {
public void patch(@NotNull JavaParameters javaParameters, @Nullable RunnerSettings settings, @NotNull RunProfile runProfile, boolean beforeExecution) {
JavaProgramPatcher.runCustomPatchers(javaParameters, DefaultRunExecutor.getRunExecutorInstance(), runProfile);
}
java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.kt
+1 -1
View File
@@ -29,5 +29,5 @@ abstract class JavaPatchableProgramRunner<Settings : RunnerSettings> : ProgramRu
}
interface JvmPatchableProgramRunner<Settings : RunnerSettings> : ProgramRunner<Settings> {
fun patch(javaParameters: JavaParameters, settings: RunnerSettings, runProfile: RunProfile, beforeExecution: Boolean)
fun patch(javaParameters: JavaParameters, settings: RunnerSettings?, runProfile: RunProfile, beforeExecution: Boolean)
}