[jbosstools-commits] JBoss Tools SVN: r42115 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-06-20 13:04:24 -0400 (Wed, 20 Jun 2012)
New Revision: 42115

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
Log:
JBIDE-12221
https://issues.jboss.org/browse/JBIDE-12221
Delta is checked for null. Cache is cleaned for project closing event in the same way as it is for removal event.

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java	2012-06-20 16:07:38 UTC (rev 42114)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java	2012-06-20 17:04:24 UTC (rev 42115)
@@ -44,13 +44,18 @@
 	}
 
 	public void resourceChanged(IResourceChangeEvent event) {
-		if(event.getType() == IResourceChangeEvent.PRE_DELETE && event.getResource() instanceof IProject) {
+		if((event.getType() == IResourceChangeEvent.PRE_DELETE
+			|| event.getType() == IResourceChangeEvent.PRE_CLOSE)
+				&& event.getResource() instanceof IProject) {
 			IProject p = (IProject)event.getResource();
 			clear(p.getFullPath());
 			return;
 		}
+		IResourceDelta delta = event.getDelta();
 		try {
-			event.getDelta().accept(visitor);
+			if(delta != null) {
+				delta.accept(visitor);
+			}
 		} catch (CoreException e) {
 			ModelPlugin.getDefault().logError(e);
 		}