Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.help')
-rw-r--r--org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java21
1 files changed, 12 insertions, 9 deletions
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java b/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
index 786531559..885847e21 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
@@ -96,16 +96,19 @@ public class UAContentMergeProcessor {
Bundle bundle = Platform.getBundle(pluginID);
ArrayList pathPrefix = ResourceLocator.getPathPrefix(locale);
- URL flatFileURL = ResourceLocator.find(bundle, new Path(pluginRelativePath), pathPrefix);
- if (flatFileURL != null)
- try {
- InputStream inputStream = flatFileURL.openStream();
- UAContentParser parser = new UAContentParser(inputStream);
- Document dom = parser.getDocument();
- return DOMUtil.getElementById(dom, include_id, "*"); //$NON-NLS-1$
- } catch (IOException e) {
- return null;
+ if (bundle != null) {
+ URL flatFileURL = ResourceLocator.find(bundle, new Path(pluginRelativePath), pathPrefix);
+ if (flatFileURL != null) {
+ try {
+ InputStream inputStream = flatFileURL.openStream();
+ UAContentParser parser = new UAContentParser(inputStream);
+ Document dom = parser.getDocument();
+ return DOMUtil.getElementById(dom, include_id, "*"); //$NON-NLS-1$
+ } catch (IOException e) {
+ return null;
+ }
}
+ }
return null;
}

Back to the top