Bug 529828 - [sonar] Resolve "Possible null pointer dereference"S4_8_0_M5I20180124-2000I20180124-0800I20180123-2000I20180123-1010I20180123-0800I20180122-2000I20180122-0800I20180121-2000I20180121-0800I20180120-1500I20180120-0800I20180119-2000I20180119-0110I20180118-2000

Change-Id: Iddfb24c63e3454c3de9e539db25c379c7775f06c
Signed-off-by: René Purrio <rpurrio@itemis.de>

2 files changed, 18 insertions, 3 deletions

diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
index 8baec7e6a..176f6bbdd 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -48,7 +49,11 @@ public class DynamicXHTMLProcessorTest {
 	protected InputStream getProcessedInput(String path, Bundle bundle)
 			throws IOException, SAXException, ParserConfigurationException,
 			TransformerException, TransformerConfigurationException {
-		try (InputStream in = bundle.getEntry(path).openStream()) {
+		URL url = bundle.getEntry(path);
+		if(url == null ) {
+			throw new IOException("No entry to '"+path+"' could be found or caller does not have the appropriate permissions.");//$NON-NLS-1$ //$NON-NLS-2$
+		}
+		try (InputStream in = url.openStream()) {
 			String href = '/' + bundle.getBundleId() + path;
 			return DynamicXHTMLProcessor.process(href, in, "en", true);
 		}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/XMLProcessorTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/XMLProcessorTest.java
index c146999c1..0628d7026 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/XMLProcessorTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/XMLProcessorTest.java
@@ -10,7 +10,9 @@
  *******************************************************************************/
 package org.eclipse.ua.tests.help.dynamic;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.help.internal.base.HelpEvaluationContext;
@@ -45,8 +47,16 @@ public class XMLProcessorTest {
 		};
 		XMLProcessor processor = new XMLProcessor(handlers);
 		Bundle bundle = UserAssistanceTestPlugin.getDefault().getBundle();
-		try (InputStream in = bundle.getEntry(FileUtil.getResultFile(path)).openStream();
-				InputStream in2 = processor.process(bundle.getEntry(path).openStream(),
+		URL url1 = bundle.getEntry(FileUtil.getResultFile(path));
+		if(url1 == null) {
+			throw new IOException("No entry to '"+FileUtil.getResultFile(path)+"' could be found or caller does not have the appropriate permissions.");//$NON-NLS-1$ //$NON-NLS-2$
+		}
+		URL url2 = bundle.getEntry(path);
+		if(url2 == null) {
+			throw new IOException("No entry to '"+path+"' could be found or caller does not have the appropriate permissions.");//$NON-NLS-1$ //$NON-NLS-2$
+		}
+		try (InputStream in = url1.openStream();
+				InputStream in2 = processor.process(url2.openStream(),
 						'/' + bundle.getSymbolicName() + '/' + path, "UTF-8")) {
 			XMLUtil.assertXMLEquals("XML content was not processed correctly: " + path, in, in2);
 		}