Function- RunnableTask: Clear runnableException @ start for re-entry; Fix tExecuted (@ exception); Add debug property 'jogamp.debug.TaskBase.TraceSource', to dump ctor stack trace @ exception.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/java/com/jogamp/common/util/FunctionTask.java b/src/java/com/jogamp/common/util/FunctionTask.java
index 8238aff..a131838 100644
--- a/src/java/com/jogamp/common/util/FunctionTask.java
+++ b/src/java/com/jogamp/common/util/FunctionTask.java
@@ -127,35 +127,41 @@ public class FunctionTask<R,A> extends TaskBase implements Function<R,A> {
         final A[] args = this.args;
         this.args = null;
         this.result = null;
+        runnableException = null;
         tStarted = System.currentTimeMillis();
         if(null == syncObject) {
             try {
                 this.result = runnable.eval(args);
+                tExecuted = System.currentTimeMillis();
             } catch (Throwable t) {
+                tExecuted = System.currentTimeMillis();
                 runnableException = t;
                 if(null != exceptionOut) {
+                    exceptionOut.println("FunctionTask.run(): "+getExceptionOutIntro()+" exception occured on thread "+Thread.currentThread().getName()+": "+toString());
+                    printSourceTrace();
                     t.printStackTrace(exceptionOut);
                 }
                 if(!catchExceptions) {
                     throw new RuntimeException(runnableException);
                 }
-            } finally {
-                tExecuted = System.currentTimeMillis();
             }
         } else {
             synchronized (syncObject) {
                 try {
                     this.result = runnable.eval(args);
+                    tExecuted = System.currentTimeMillis();
                 } catch (Throwable t) {
+                    tExecuted = System.currentTimeMillis();
                     runnableException = t;
                     if(null != exceptionOut) {
+                        exceptionOut.println("FunctionTask.run(): "+getExceptionOutIntro()+" exception occured on thread "+Thread.currentThread().getName()+": "+toString());
+                        printSourceTrace();
                         t.printStackTrace(exceptionOut);
                     }
                     if(!catchExceptions) {
                         throw new RuntimeException(runnableException);
                     }
                 } finally {
-                    tExecuted = System.currentTimeMillis();
                     syncObject.notifyAll();
                 }
             }