[541220] NPE in JaxRsConfigurator when importing Web App

Change-Id: I5b2699d335d0a8ecc9aef9abeba4122adf1e43e7

7 files changed, 14 insertions, 10 deletions

diff --git a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF
index 1c6989547..f4fb916d2 100644
--- a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.ws.jaxrs.ui;singleton:=true
-Bundle-Version: 1.0.800.qualifier
+Bundle-Version: 1.0.801.qualifier
 Bundle-Activator: org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/pom.xml b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/pom.xml
index e9dbf8dbf..95dd06ad9 100644
--- a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.jaxrs.ui</artifactId>

-  <version>1.0.800-SNAPSHOT</version>

+  <version>1.0.801-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/importer/JaxRsConfigurator.java b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/importer/JaxRsConfigurator.java
index e7b158032..7d9286c8b 100644
--- a/core/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/importer/JaxRsConfigurator.java
+++ b/core/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/importer/JaxRsConfigurator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2016, 2019 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -64,8 +64,12 @@ public class JaxRsConfigurator implements ProjectConfigurator {
 			return false;
 		} finally {
 			try {
-				reader.close();
-				content.close();
+				if (reader != null) {
+					reader.close();
+				}
+				if (content != null) {
+					content.close();
+				}
 			} catch (IOException ex) {
 				// annoying exception handling
 			}
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index 5864195fa..4406f9255 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_sdk.feature"
       label="%featureName"
-      version="3.8.100.qualifier"
+      version="3.8.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.0.qualifier">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
index 67ab2e7e2..db79aa75e 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId>
-  <version>3.8.100-SNAPSHOT</version>
+  <version>3.8.200-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 2bbb18756..eeafe37e7 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_ui.feature"
       label="%featureName"
-      version="3.9.400.qualifier"
+      version="3.9.500.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.jst.jee.ui"
       license-feature="org.eclipse.license"
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index 4ad2ad2c9..bde38e91b 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2018 Eclipse Foundation and others.
+  Copyright (c) 2012, 2019 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
-  <version>3.9.400-SNAPSHOT</version>
+  <version>3.9.500-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>