Attachment 211325 Details for Bug 354368 – Proposed patch

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

[patch] Proposed patch

Bug-354368.patch (text/plain), 2.54 KB, created by Ivan Furnadjiev

on 2012-02-21 07:23:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2012-02-21 07:23:23 EST

Size: 2.54 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.62
>diff -u -r1.62 RWTLifeCycle.java
>--- src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java	25 Jan 2012 15:03:38 -0000	1.62
>+++ src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java	21 Feb 2012 12:21:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH and others.
>+ * Copyright (c) 2002, 2012 Innoopract Informationssysteme GmbH and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -33,6 +33,8 @@
> 
>   private static final String CURRENT_PHASE = RWTLifeCycle.class.getName() + ".currentPhase";
>   private static final String PHASE_ORDER = RWTLifeCycle.class.getName() + ".phaseOrder";
>+  private static final String UI_THREAD_WAITING_FOR_THE_END
>+    = UIThreadController.class.getName() + "#UIThreadWaitingForTheEnd";
>   private static final String UI_THREAD_THROWABLE
>     = UIThreadController.class.getName() + "#UIThreadThrowable";
>   private static final String REQUEST_THREAD_RUNNABLE
>@@ -190,7 +192,10 @@
>       }
>     } else {
>       uiThread.setServiceContext( context );
>-      uiThread.switchThread();
>+      // See bug 354368
>+      if( !Boolean.TRUE.equals( session.getAttribute( UI_THREAD_WAITING_FOR_THE_END ) ) ) {
>+        uiThread.switchThread();
>+      }
>     }
>     // TODO [rh] consider moving this to UIThreadController#run
>     if( !uiThread.getThread().isAlive() ) {
>@@ -289,6 +294,11 @@
>             IServiceStore serviceStore = ContextProvider.getServiceStore();
>             serviceStore.setAttribute( UI_THREAD_THROWABLE, thr );
>           }
>+          // We have to prevent the ui thread from waking up at that point, otherwise
>+          // processShutdown would never be executed and session store would not be cleared.
>+          // See bug 354368
>+          ISessionStore sessionStore = ContextProvider.getSessionStore();
>+          sessionStore.setAttribute( UI_THREAD_WAITING_FOR_THE_END, Boolean.TRUE );
>           // In any case: wait for the thread to be terminated by session timeout
>           uiThread.switchThread();
>         }

Actions: View | Diff

Attachments on bug 354368: 204804 | 211281 | 211324 | 211325 | 211333