langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
equal
deleted
inserted
replaced
31 import java.io.OutputStream; |
31 import java.io.OutputStream; |
32 import java.net.InetAddress; |
32 import java.net.InetAddress; |
33 import java.net.ServerSocket; |
33 import java.net.ServerSocket; |
34 import java.net.Socket; |
34 import java.net.Socket; |
35 import java.util.ArrayList; |
35 import java.util.ArrayList; |
|
36 import java.util.Collections; |
36 import java.util.HashMap; |
37 import java.util.HashMap; |
37 import java.util.List; |
38 import java.util.List; |
38 import java.util.Map; |
39 import java.util.Map; |
39 import java.util.function.Consumer; |
40 import java.util.function.Consumer; |
40 import com.sun.jdi.BooleanValue; |
41 import com.sun.jdi.BooleanValue; |
95 listener.setSoTimeout(timeout); |
96 listener.setSoTimeout(timeout); |
96 int port = listener.getLocalPort(); |
97 int port = listener.getLocalPort(); |
97 |
98 |
98 // Set-up the JDI connection |
99 // Set-up the JDI connection |
99 JdiInitiator jdii = new JdiInitiator(port, |
100 JdiInitiator jdii = new JdiInitiator(port, |
100 env.extraRemoteVMOptions(), remoteAgent, isLaunch, host, timeout); |
101 env.extraRemoteVMOptions(), remoteAgent, isLaunch, host, |
|
102 timeout, Collections.emptyMap()); |
101 VirtualMachine vm = jdii.vm(); |
103 VirtualMachine vm = jdii.vm(); |
102 Process process = jdii.process(); |
104 Process process = jdii.process(); |
103 |
105 |
104 List<Consumer<String>> deathListeners = new ArrayList<>(); |
106 List<Consumer<String>> deathListeners = new ArrayList<>(); |
105 Util.detectJdiExitEvent(vm, s -> { |
107 Util.detectJdiExitEvent(vm, s -> { |