Attachment 171976 Details for Bug 316676 – Bugfix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Bugfix

clipboard.txt (text/plain), 2.44 KB, created by Rüdiger Herrmann

on 2010-06-15 14:29:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2010-06-15 14:29:38 EDT

Size: 2.44 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java,v
>retrieving revision 1.32
>diff -u -r1.32 RWTLifeCycle.java
>--- src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java	11 Jun 2010 21:51:24 -0000	1.32
>+++ src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java	15 Jun 2010 18:27:41 -0000
>@@ -104,28 +104,29 @@
>   private final class UIThreadController implements Runnable {
>     public void run() {
>       IUIThreadHolder uiThread = ( IUIThreadHolder )Thread.currentThread();
>-      try {
>+      // [rh] sync exception handling and switchThread (see bug 316676)
>+      synchronized( uiThread.getLock() ) {
>         try {
>-          synchronized( uiThread.getLock() ) {
>+          try {
>             uiThread.updateServiceContext();
>             UICallBackManager.getInstance().notifyUIThreadStart();
>             continueLifeCycle();
>             createUI();
>             continueLifeCycle();
>             UICallBackManager.getInstance().notifyUIThreadEnd();
>+          } catch( UIThreadTerminatedError thr ) {
>+            throw thr;
>+          } catch( Throwable thr ) {
>+            IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
>+            stateInfo.setAttribute( UI_THREAD_THROWABLE, thr );
>           }
>-        } catch( UIThreadTerminatedError thr ) {
>-          throw thr;
>-        } catch( Throwable thr ) {
>-          IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
>-          stateInfo.setAttribute( UI_THREAD_THROWABLE, thr );
>+          // In any case: wait for the thread to be terminated by session timeout
>+          uiThread.switchThread();
>+        } catch( UIThreadTerminatedError e ) {
>+          // If we get here, the session is being invalidated, see
>+          // UIThread#terminateThread()
>+          ( ( ISessionShutdownAdapter )uiThread ).processShutdown();
>         }
>-        // In any case: wait for the thread to be terminated by session timeout
>-        uiThread.switchThread();
>-      } catch( UIThreadTerminatedError e ) {
>-        // If we get here, the session is being invalidated, see
>-        // UIThread#terminateThread()
>-        ( ( ISessionShutdownAdapter )uiThread ).processShutdown();
>       }
>     }
>   }

Actions: View | Diff

Attachments on bug 316676: 171783 | 171976