jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java

equal deleted inserted replaced

-:2537564a3031
+:82e273c4f2b3
 import jdk.jshell.spi.ExecutionControl;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.PrintStream;
+import java.net.InetAddress;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 final PrintStream err;
 final Supplier<String> tempVariableNameGenerator;
 final BiFunction<Snippet, Integer, String> idGenerator;
 final List<String> extraRemoteVMOptions;
 final List<String> extraCompilerOptions;
-final ExecutionControl.Generator executionControlGenerator;
 private int nextKeyIndex = 1;
 final Eval eval;
 final ClassTracker classTracker;
 private final Map<Subscription, Consumer<JShell>> shutdownListeners = new HashMap<>();
 private final Map<Subscription, Consumer<SnippetEvent>> keyStatusListeners = new HashMap<>();
 private boolean closed = false;
-private ExecutionControl executionControl = null;
+private final ExecutionControl executionControl;
 private SourceCodeAnalysisImpl sourceCodeAnalysis = null;
 private static final String L10N_RB_NAME    = "jdk.jshell.resources.l10n";
 private static ResourceBundle outputRB  = null;
-JShell(Builder b) {
+JShell(Builder b) throws IllegalStateException {
 this.in = b.in;
 this.out = b.out;
 this.err = b.err;
 this.tempVariableNameGenerator = b.tempVariableNameGenerator;
 this.idGenerator = b.idGenerator;
 this.extraRemoteVMOptions = b.extraRemoteVMOptions;
 this.extraCompilerOptions = b.extraCompilerOptions;
-this.executionControlGenerator = b.executionControlGenerator==null
+ExecutionControl.Generator executionControlGenerator = b.executionControlGenerator==null
-? failOverExecutionControlGenerator(JdiDefaultExecutionControl.launch(),
+? failOverExecutionControlGenerator(
-JdiDefaultExecutionControl.listen("localhost"),
+JdiDefaultExecutionControl.listen(InetAddress.getLoopbackAddress().getHostAddress()),
-JdiDefaultExecutionControl.listen(null))
+JdiDefaultExecutionControl.launch(),
+JdiDefaultExecutionControl.listen(null)
+)
 : b.executionControlGenerator;
+try {
+executionControl = executionControlGenerator.generate(new ExecutionEnvImpl());
+} catch (Throwable ex) {
+throw new IllegalStateException("Launching JShell execution engine threw: " + ex.getMessage(), ex);
+}
 this.maps = new SnippetMaps(this);
 this.keyMap = new KeyMap(this);
 this.outerMap = new OuterWrapMap(this);
 this.taskFactory = new TaskFactory(this);
 /**
 * Builds a JShell state engine. This is the entry-point to all JShell
 * functionality. This creates a remote process for execution. It is
 * thus important to close the returned instance.
 *
+* @throws IllegalStateException if the {@code JShell} instance could not be created.
 * @return the state engine
 */
-public JShell build() {
+public JShell build() throws IllegalStateException {
 return new JShell(this);
 }
 }
 // --- public API ---
 /**
 * Create a new JShell state engine.
 * That is, create an instance of {@code JShell}.
 * <p>
 * Equivalent to {@link JShell#builder() JShell.builder()}{@link JShell.Builder#build() .build()}.
+* @throws IllegalStateException if the {@code JShell} instance could not be created.
 * @return an instance of {@code JShell}.
 */
-public static JShell create() {
+public static JShell create() throws IllegalStateException {
 return builder().build();
 }
 /**
 * Factory method for {@code JShell.Builder} which, in-turn, is used
 /**
 * The specified path is added to the end of the classpath used in eval().
 * Note that the unnamed package is not accessible from the package in which
 * {@link JShell#eval(String)} code is placed.
 * @param path the path to add to the classpath.
+* @throws IllegalStateException if this {@code JShell} instance is closed.
 */
 public void addToClasspath(String path) {
 // Compiler
 taskFactory.addToClasspath(path);
 // Runtime
 */
 @Override
 public void close() {
 if (!closed) {
 closeDown();
-executionControl().close();
+try {
+executionControl().close();
+} catch (Throwable ex) {
+// don't care about exceptions on close
+}
 if (sourceCodeAnalysis != null) {
 sourceCodeAnalysis.close();
 }
 }
 }
 }
 }
 // --- private / package-private implementation support ---
 ExecutionControl executionControl() {
-if (executionControl == null) {
-try {
-executionControl =  executionControlGenerator.generate(new ExecutionEnvImpl());
-} catch (Throwable ex) {
-throw new InternalError("Launching execution engine threw: " + ex.getMessage(), ex);
-}
-}
 return executionControl;
 }
 void debug(int flags, String format, Object... args) {
 InternalDebugControl.debug(this, err, flags, format, args);

changeset 42272	82e273c4f2b3
parent 41941	a935ac3f5274
child 42969	a48d4f74d322