[293047] Problem with WTPWorkingCopyManager and deleting projects

1 files changed, 14 insertions, 11 deletions

diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
index fa77cffcf..c43d15d42 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
@@ -398,17 +398,19 @@ public class WTPWorkingCopyManager implements WorkingCopyManager {
 	}
 
 	protected void reviveDeletedCompilationUnit(ICompilationUnit cu, Object[] info, IProgressMonitor pm) {
-		if (info[0] != null && info[1] != null) {
-			String typeName = cu.getElementName();
-			IPackageFragment pack = (IPackageFragment) info[0];
-			String source = (String) info[1];
-			try {
-				ICompilationUnit existingCU = pack.getCompilationUnit(typeName);
-				if (existingCU.exists() && getNewCompilationUnits().contains(existingCU))
-					existingCU.delete(false, pm);
-				pack.createCompilationUnit(typeName, source, false, pm);
-			} catch (JavaModelException e) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
+		if(cu.getJavaProject().isOpen()) {
+			if (info[0] != null && info[1] != null) {
+				String typeName = cu.getElementName();
+				IPackageFragment pack = (IPackageFragment) info[0];
+				String source = (String) info[1];
+				try {
+					ICompilationUnit existingCU = pack.getCompilationUnit(typeName);
+					if (existingCU.exists() && getNewCompilationUnits().contains(existingCU))
+						existingCU.delete(false, pm);
+					pack.createCompilationUnit(typeName, source, false, pm);
+				} catch (JavaModelException e) {
+					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
+				}
 			}
 		}
 	}
@@ -416,6 +418,7 @@ public class WTPWorkingCopyManager implements WorkingCopyManager {
 	protected void reviveDeletedCompilationUnits() {
 		if (getDeletedCompilationUnits().isEmpty())
 			return;
+		
 		IProgressMonitor pm = new org.eclipse.core.runtime.NullProgressMonitor();
 		Iterator it = getDeletedCompilationUnits().entrySet().iterator();
 		Map.Entry entry;