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

use jb-jdi 1.2

Browse Source 
GitOrigin-RevId: 792d766755eca0302096928ce5b552082b6eca92
This commit is contained in:
Egor Ushakov
2019-12-06 15:10:09 +00:00
committed by intellij-monorepo-bot
parent d0407342dd
commit 1c5f538a0f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/intellij.java.debugger.impl.iml
+3 -3
View File
@@ -36,13 +36,13 @@
</orderEntry>
<orderEntry type="module-library">
<library name="jb-jdi" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:jb-jdi:1.1" />
<properties maven-id="org.jetbrains.intellij.deps:jb-jdi:1.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/1.1/jb-jdi-1.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/1.2/jb-jdi-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/1.1/jb-jdi-1.1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/1.2/jb-jdi-1.2-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+11 -5
View File
@@ -70,6 +70,7 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.intellij.xdebugger.impl.XDebuggerManagerImpl;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
import com.jetbrains.jdi.VirtualMachineManagerImpl;
import com.sun.jdi.*;
import com.sun.jdi.connect.*;
import com.sun.jdi.request.EventRequest;
@@ -612,12 +613,17 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
@NotNull
public static Connector findConnector(String connectorName) throws ExecutionException {
VirtualMachineManager virtualMachineManager;
try {
virtualMachineManager = Bootstrap.virtualMachineManager();
if (Registry.is("debugger.jb.jdi")) {
virtualMachineManager = VirtualMachineManagerImpl.virtualMachineManager();
}
catch (Error e) {
throw new ExecutionException(DebuggerBundle.message("debugger.jdi.bootstrap.error",
e.getClass().getName() + " : " + e.getLocalizedMessage()));
else {
try {
virtualMachineManager = Bootstrap.virtualMachineManager();
}
catch (Error e) {
throw new ExecutionException(DebuggerBundle.message("debugger.jdi.bootstrap.error",
e.getClass().getName() + " : " + e.getLocalizedMessage()));
}
}
return StreamEx.of(virtualMachineManager.allConnectors())
.findFirst(c -> connectorName.equals(c.name()))