Net: unwrap the exception if it came from the user code

JakubValtar · JakubValtar · commit 2b1cd66f834c · 2018-01-22T13:44:43.000+01:00
diff --git a/java/libraries/net/src/processing/net/Client.java b/java/libraries/net/src/processing/net/Client.java
@@ -155,7 +155,12 @@ public void stop() {
       try {
         disconnectEventMethod.invoke(parent, this);
       } catch (Exception e) {
-        e.printStackTrace();
+        Throwable cause = e;
+        // unwrap the exception if it came from the user code
+        if (e instanceof InvocationTargetException && e.getCause() != null) {
+          cause = e.getCause();
+        }
+        cause.printStackTrace();
         disconnectEventMethod = null;
       }
     }
@@ -266,7 +271,12 @@ public void run() {
               clientEventMethod.invoke(parent, this);
             } catch (Exception e) {
               System.err.println("error, disabling clientEvent() for " + host);
-              e.printStackTrace();
+              Throwable cause = e;
+              // unwrap the exception if it came from the user code
+              if (e instanceof InvocationTargetException && e.getCause() != null) {
+                cause = e.getCause();
+              }
+              cause.printStackTrace();
               clientEventMethod = null;
             }
           }
diff --git a/java/libraries/net/src/processing/net/Server.java b/java/libraries/net/src/processing/net/Server.java
@@ -308,7 +308,12 @@ public void run() {
               serverEventMethod.invoke(parent, this, client);
             } catch (Exception e) {
               System.err.println("Disabling serverEvent() for port " + port);
-              e.printStackTrace();
+              Throwable cause = e;
+              // unwrap the exception if it came from the user code
+              if (e instanceof InvocationTargetException && e.getCause() != null) {
+                cause = e.getCause();
+              }
+              cause.printStackTrace();
               serverEventMethod = null;
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,12 @@ public void run() {`
`308`	`308`	`serverEventMethod.invoke(parent, this, client);`
`309`	`309`	`} catch (Exception e) {`
`310`	`310`	`System.err.println("Disabling serverEvent() for port " + port);`
`311`		`- e.printStackTrace();`
	`311`	`+ Throwable cause = e;`
	`312`	`+ // unwrap the exception if it came from the user code`
	`313`	`+ if (e instanceof InvocationTargetException && e.getCause() != null) {`
	`314`	`+ cause = e.getCause();`
	`315`	`+ }`
	`316`	`+ cause.printStackTrace();`
`312`	`317`	`serverEventMethod = null;`
`313`	`318`	`}`
`314`	`319`	`}`