diff options
| author | dacarver | 2011-01-28 14:13:24 +0000 |
|---|---|---|
| committer | dacarver | 2011-01-28 14:13:24 +0000 |
| commit | 3ff078d6e4cae5d807d2cbb2938ea2c886559794 (patch) | |
| tree | e2a957a98721a7a4197c97b7b82b2b30ad5db1f5 | |
| parent | 34de8822bf78479b1565d64a0daa70936bedbbd9 (diff) | |
| download | webtools.sourceediting.xsl-3ff078d6e4cae5d807d2cbb2938ea2c886559794.tar.gz webtools.sourceediting.xsl-3ff078d6e4cae5d807d2cbb2938ea2c886559794.tar.xz webtools.sourceediting.xsl-3ff078d6e4cae5d807d2cbb2938ea2c886559794.zip | |
[335273] NPE when trying to open XSL file with EXSLT Func and Parm.
3 files changed, 8 insertions, 3 deletions
diff --git a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF index aa7365a..e9a9b0d 100644 --- a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsl.core;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Activator: org.eclipse.wst.xsl.core.internal.XSLCorePlugin Require-Bundle: org.apache.xalan;bundle-version="[2.7.1,2.8.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", diff --git a/bundles/org.eclipse.wst.xsl.core/pom.xml b/bundles/org.eclipse.wst.xsl.core/pom.xml index c2b8f57..1db5e81 100644 --- a/bundles/org.eclipse.wst.xsl.core/pom.xml +++ b/bundles/org.eclipse.wst.xsl.core/pom.xml @@ -5,7 +5,7 @@ <groupId>org.eclipse.wst.xsl</groupId> <artifactId>org.eclipse.wst.xsl.core</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <name>XSLT Core Plugin</name> <parent> diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/model/XSLModelObjectFactory.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/model/XSLModelObjectFactory.java index 8c60e33..f406790 100644 --- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/model/XSLModelObjectFactory.java +++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/model/XSLModelObjectFactory.java @@ -91,7 +91,12 @@ public class XSLModelObjectFactory { } private boolean notParentStylesheet() { - return stylesheetParserData.getParentEl().getModelType() != XSLModelObject.Type.STYLESHEET; + XSLElement parentElement = stylesheetParserData.getParentEl(); + if (parentElement == null) { + return true; + } + + return parentElement.getModelType() != XSLModelObject.Type.STYLESHEET; } private void configure(IDOMNode node, XSLElement element) { |