Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis D'Entremont2006-03-09 16:51:23 -0500
committerCurtis D'Entremont2006-03-09 16:51:23 -0500
commit12609ee055837cebb912928882fd078b8675d84d (patch)
treeb7c60d180a45d598a5dc3d48fe7e72d84eb79295 /org.eclipse.help
parent863c928db8e6cbda74598ed41dc65e090dc12b00 (diff)
downloadeclipse.platform.ua-12609ee055837cebb912928882fd078b8675d84d.tar.gz
eclipse.platform.ua-12609ee055837cebb912928882fd078b8675d84d.tar.xz
eclipse.platform.ua-12609ee055837cebb912928882fd078b8675d84d.zip
[Bug 131197] include pointing to non-present plugin causes topic to not show
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