[326963] NPE when running Servlet on server if <servlet-class> is not defined
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html index 15fccc0..d1d3642 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
@@ -18,6 +18,7 @@ <p>Bug <a href='https://bugs.eclipse.org/326417'>326417</a>. Deployment Assembly Verifier for classpath entries</p> <p>Bug <a href='https://bugs.eclipse.org/326468'>326468</a>. Duplicate accelerator key in new web project wizard</p> <p>Bug <a href='https://bugs.eclipse.org/326549'>326549</a>. Web Service Wizard Can Default to invalid project type</p> +<p>Bug <a href='https://bugs.eclipse.org/326963'>326963</a>. NPE when running Servlet on server if servlet-class is not defined</p> </body> </html> \ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties index 1c8949e..8fc5680 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
@@ -33,6 +33,7 @@ Bug https://bugs.eclipse.org/326417 Deployment Assembly Verifier for classpath entries\n\ Bug https://bugs.eclipse.org/326468 Duplicate accelerator key in new web project wizard\n\ Bug https://bugs.eclipse.org/326549 Web Service Wizard Can Default to invalid project type\n\ +Bug https://bugs.eclipse.org/326963 NPE when running Servlet on server if <servlet-class> is not defined\n\ \n\ # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml index 6970bbd..39f9fd1 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
@@ -49,4 +49,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.jst.jee.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF index 265b792..51b9c61 100644 --- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true -Bundle-Version: 1.0.302.qualifier +Bundle-Version: 1.0.303.qualifier Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java index 565045a..dc5c32d 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
@@ -333,8 +333,7 @@ if (servlets != null && !servlets.isEmpty()) { for (int i = 0; i < servlets.size(); i++) { org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet)servlets.get(i); - if( servlet.getServletClass().equals(typeName)){ - + if (servlet.getServletClass() != null && servlet.getServletClass().equals(typeName)) { java.util.List mappings = webApp.getServletMappings(); if (mappings != null && !mappings.isEmpty()) { Iterator it = mappings.iterator(); @@ -364,6 +363,9 @@ } private static List getServletMappings(IResource resource, String typeName){ + if (typeName == null || typeName.equals("")) //$NON-NLS-1$ + return null; + IModelProvider provider = ModelProviderManager.getModelProvider( resource.getProject() ); IWebCommon webApp = (IWebCommon)provider.getModelObject();