From 48742033a54c6747929f6652e872462923c02df2 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 26 Jul 2007 14:33:51 +0000 Subject: [PATCH] follow-up for fix for [Bug 196048] Updating .cproject from CVS does not cause reload of settings --- .../internal/core/settings/model/ResourceChangeHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java index 9414c5ae52e..86013b6fa98 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java @@ -161,7 +161,8 @@ public class ResourceChangeHandler extends ResourceChangeHandlerBase implements flags |= CProjectDescriptionManager.INTERNAL_GET_IGNORE_CLOSE; flags |= CProjectDescriptionManager.GET_WRITABLE; des = fMngr.getProjectDescription(project, flags); - fProjDesMap.put(project, des); + if(des != null) + fProjDesMap.put(project, des); } return des; }