bug 144087 - NPE: Cancel out of a Bundle-Activator "create new..." quickfix

2 files changed, 2 insertions, 2 deletions

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateClassXMLResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateClassXMLResolution.java
index eefa26e37d..06ce7e1870 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateClassXMLResolution.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateClassXMLResolution.java
@@ -45,7 +45,7 @@ public class CreateClassXMLResolution extends AbstractXMLMarkerResolution {
 		
 		JavaAttributeValue value = new JavaAttributeValue(project, model, getAttribute(attr), name);
 		name = PDEJavaHelper.createClass(name, project, value, true);
-		if (!name.equals(attr.getValue())) 
+		if (name != null && !name.equals(attr.getValue())) 
 			attr.getEnclosingElement().setXMLAttribute(attr.getName(), name);
 	}
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
index dd5a41466e..da851c0c6a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateManifestClassResolution.java
@@ -41,7 +41,7 @@ public class CreateManifestClassResolution extends AbstractManifestMarkerResolut
 		
 		JavaAttributeValue value = new JavaAttributeValue(project, modelBase, null, name);
 		name = PDEJavaHelper.createClass(name, project, value, true);
-		if (!name.equals(header.getValue())) 
+		if (name != null && !name.equals(header.getValue())) 
 			header.setValue(name);
 	}