Bug 78303 [Decorators] Workspace is closed exception on shutdown

1 files changed, 9 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
index ec06a3ee4..1408a89f2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -32,6 +33,7 @@ import org.eclipse.team.internal.core.ExceptionCollector;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.themes.ITheme;
+import org.osgi.framework.Bundle;
 
 public class CVSLightweightDecorator extends LabelProvider implements ILightweightLabelDecorator, IResourceStateChangeListener, IPropertyChangeListener {
 
@@ -166,6 +168,13 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig
 			cvsDecoration.apply(decoration);
 		} catch(CVSException e) {
 			handleException(e);
+		} catch (IllegalStateException e) {
+		    // This is thrown by Core if the workspace is in an illegal state
+		    // If we are not active, ignore it. Otherwise, propogate it.
+		    // (see bug 78303)
+		    if (Platform.getBundle(CVSUIPlugin.ID).getState() == Bundle.ACTIVE) {
+		        throw e;
+		    }
 		}
 	}