Merge branch 'master' of github.com:processing/processing

benfry · benfry · commit ca77a0fb5c19 · 2016-02-13T17:33:54.000-05:00
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
@@ -747,6 +747,12 @@ protected SketchException findException(String message, ObjectReference or, Thre
       // This shouldn't happen, but if it does, print the exception in case
       // it's something that needs to be debugged separately.
       e.printStackTrace(sketchErr);
+    } catch (Exception e) {
+      // stack overflows seem to trip in frame.location() above
+      // ignore this case so that the actual error gets reported to the user
+      if ("StackOverflowError".equals(message) == false) {
+        e.printStackTrace(sketchErr);
+      }
     }
     // before giving up, try to extract from the throwable object itself
     // since sometimes exceptions are re-thrown from a different context
@@ -778,7 +784,11 @@ protected SketchException findException(String message, ObjectReference or, Thre
       or.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
 
     } catch (Exception e) {
-      e.printStackTrace(sketchErr);
+      // stack overflows will make the exception handling above trip again
+      // ignore this case so that the actual error gets reported to the user
+      if ("StackOverflowError".equals(message) == false) {
+        e.printStackTrace(sketchErr);
+      }
     }
     // Give up, nothing found inside the pile of stack frames
     SketchException rex = new SketchException(message);
