Attachment 137561 Details for Bug 276930 – Proposed patch to fix the problem

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

[patch] Proposed patch to fix the problem

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

on 2009-05-28 17:24:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-05-28 17:24:25 EDT

Size: 2.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/lifecycle/UICallBackServiceHandler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/UICallBackServiceHandler.java,v
>retrieving revision 1.16
>diff -u -r1.16 UICallBackServiceHandler.java
>--- src/org/eclipse/rwt/internal/lifecycle/UICallBackServiceHandler.java	29 Apr 2009 13:24:52 -0000	1.16
>+++ src/org/eclipse/rwt/internal/lifecycle/UICallBackServiceHandler.java	28 May 2009 21:17:54 -0000
>@@ -17,6 +17,7 @@
> import javax.servlet.*;
> import javax.servlet.http.*;
> 
>+import org.eclipse.rwt.RWT;
> import org.eclipse.rwt.SessionSingletonBase;
> import org.eclipse.rwt.internal.service.*;
> import org.eclipse.rwt.internal.util.HTML;
>@@ -415,8 +416,10 @@
>   }
> 
>   public void service() throws IOException, ServletException {
>+    ISessionStore sessionStore = RWT.getSessionStore();
>     if(    !UICallBackManager.getInstance().blockCallBackRequest()
>-        && ContextProvider.hasContext() )
>+        && ContextProvider.hasContext() 
>+        && sessionStore.isBound() )
>     {
>       writeResponse();
>     }
>Index: src/org/eclipse/rwt/internal/lifecycle/UICallBackManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/UICallBackManager.java,v
>retrieving revision 1.17
>diff -u -r1.17 UICallBackManager.java
>--- src/org/eclipse/rwt/internal/lifecycle/UICallBackManager.java	5 May 2009 10:12:20 -0000	1.17
>+++ src/org/eclipse/rwt/internal/lifecycle/UICallBackManager.java	28 May 2009 21:17:54 -0000
>@@ -211,7 +211,14 @@
>       } finally {
>         locked.remove( currentThread );
>         if( !result ) {
>-          ContextProvider.getSession().removeSessionStoreListener( listener );
>+          // TODO [rh] remove the try/catch block once this bug 278258 is fixed
>+          //      (Rework ISessionStore#add/removeSessionStoreListener)
>+          try {
>+            ContextProvider.getSession().removeSessionStoreListener( listener );
>+          } catch( IllegalStateException e ) {
>+            // ignore - the session store is (about to be) unbound, this means
>+            // the listener is/will be removed anyway
>+          }
>         }
>       }
>       waitForUIThread = true;

Actions: View | Diff

Attachments on bug 276930: 137561