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

equal deleted inserted replaced

-:8b6a878d8773
+:e57f1a5c9346
 value = si.subKind().hasValue()
 ? expunge(value)
 : "";
 } catch (ResolutionException ex) {
 DeclarationSnippet sn = (DeclarationSnippet) state.maps.getSnippetDeadOrAlive(ex.id());
-exception = new UnresolvedReferenceException(sn, ex.getStackTrace());
+exception = new UnresolvedReferenceException(sn, translateExceptionStack(ex));
 } catch (UserException ex) {
-exception = translateExecutionException(ex);
+exception = new EvalException(translateExceptionMessage(ex),
+ex.causeExceptionClass(),
+translateExceptionStack(ex));
 } catch (RunException ex) {
 // StopException - no-op
 } catch (InternalException ex) {
 state.debug(ex, "invoke");
 } catch (EngineTerminationException ex) {
 state.closeDown();
 }
 }
 }
-private EvalException translateExecutionException(UserException ex) {
+private StackTraceElement[] translateExceptionStack(Exception ex) {
 StackTraceElement[] raw = ex.getStackTrace();
 int last = raw.length;
 do {
 if (last == 0) {
 last = raw.length - 1;
 elems[i] = new StackTraceElement(r.getClassName(), r.getMethodName(), null, r.getLineNumber());
 } else {
 elems[i] = r;
 }
 }
+return elems;
+}
+private String translateExceptionMessage(Exception ex) {
 String msg = ex.getMessage();
-if (msg.equals("<none>")) {
+return msg.equals("<none>")
-msg = null;
+? null
-}
+: msg;
-return new EvalException(msg, ex.causeExceptionClass(), elems);
 }
 private boolean isWrap(StackTraceElement ste) {
 return PREFIX_PATTERN.matcher(ste.getClassName()).find();
 }

changeset 40769	e57f1a5c9346
parent 39807	ba0ff343d241
child 41514	a75c2b869d8d