Attachment 147336 Details for Bug 280363 – Proposed fix

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

[patch] Proposed fix

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

on 2009-09-16 12:00:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-09-16 12:00:11 EDT

Size: 2.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java,v
>retrieving revision 1.3
>diff -u -r1.3 DecoratorManager.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java	24 Apr 2008 20:34:05 -0000	1.3
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java	16 Sep 2009 16:02:50 -0000
>@@ -44,6 +44,9 @@
> import org.eclipse.jface.viewers.ILightweightLabelDecorator;
> import org.eclipse.jface.viewers.LabelDecorator;
> import org.eclipse.jface.viewers.LabelProviderChangedEvent;
>+import org.eclipse.rwt.RWT;
>+import org.eclipse.rwt.service.SessionStoreEvent;
>+import org.eclipse.rwt.service.SessionStoreListener;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Image;
>@@ -286,6 +289,12 @@
> 				.createExtensionPointFilter(getExtensionPointFilter()));
> 
> 		resourceManager = null;
>+		// RAP [rh] shut down decoration manager when session is invalidated (see bug 280363)
>+		RWT.getSessionStore().addSessionStoreListener( new SessionStoreListener() {
>+      public void beforeDestroy( final SessionStoreEvent event ) {
>+        shutdown();
>+      }
>+    } );
> 	}
> 
> 	/**
>Index: Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java,v
>retrieving revision 1.3
>diff -u -r1.3 DecorationScheduler.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java	24 Apr 2008 20:34:04 -0000	1.3
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java	16 Sep 2009 16:02:50 -0000
>@@ -333,7 +333,7 @@
>         }
> 
>         while (updatesPending()) {
>-
>+System.out.println("Update Pending:");
>           try {
>             Thread.sleep(100);
>           } catch (InterruptedException e) {
>@@ -478,6 +478,9 @@
> 	 * @return <code>true</code> if there are updates waiting to be served
> 	 */
> 	protected boolean updatesPending() {
>+	  // RAP [rh] stop updating when session is invalidated (see bug 280363) 
>+	  if( shutdown )
>+	    return false;
> 		if (updateJob != null && updateJob.getState() != Job.NONE) {
> 			return true;
> 		}
>@@ -550,7 +553,6 @@
> 			ILabelProviderListener[] listeners;
> 
> 			public IStatus runInUIThread(IProgressMonitor monitor) {
>-
> 				synchronized (DecorationScheduler.this) {
> 					if (shutdown) {
> 						return Status.CANCEL_STATUS;

Actions: View | Diff

Attachments on bug 280363: 147179 | 147336