[573267] NullPointerException when deleting Dynamic Web Project

Signed-off-by: Jeff MAURY <jmaury@redhat.com>

plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java

diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java
index 3392a2b..4132a3f 100644
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java
@@ -188,7 +188,9 @@
 				addManagedResource(res);
 			} else {//First find in resource set, then create if not found new Empty Resource.
 				XMLResourceImpl newRes =  createModelResource(innerModelPath, resSet, projURI);
-				addManagedResource(newRes);
+				if (newRes != null) {
+					addManagedResource(newRes);
+				}
 				return newRes;
 			}
 		} catch (WrappedException ex) {
@@ -206,8 +208,10 @@
 		if (res == null || !res.isLoaded()) {
 			// Create temp resource if no file exists
 			res=  (XMLResourceImpl)((FlexibleProjectResourceSet)resourceSet).createResource(getModuleURI(uri),WTPResourceFactoryRegistry.INSTANCE.getFactory(uri, getContentType(getContentTypeDescriber())));
-			res.setEncoding("UTF-8"); //$NON-NLS-1$
-			populateRoot(res, resourceSet.getProject().getName());
+			if (res != null) {
+				res.setEncoding("UTF-8"); //$NON-NLS-1$
+				populateRoot(res, resourceSet.getProject().getName());
+			}
 		}
 		return res;
 	}