| commit | e1b0ac9698d750c29116f44c7288022a04696632 | [log] [tgz] |
|---|---|---|
| author | Jesper Steen Møller <jesper@selskabet.org> | Tue Apr 09 02:04:35 2013 +0200 |
| committer | Jesper Steen Møller <jesper@selskabet.org> | Tue Apr 09 02:04:35 2013 +0200 |
| tree | 3874d17945acc52c0e0f3a66291cbf6bb307ee24 | |
| parent | adc925a9abb8d344a7e39e49a0797707ae5ef641 [diff] |
Bug 337649: NPE when xsl:variable does not have @name specified https://bugs.eclipse.org/bugs/show_bug.cgi?id=337649
diff --git a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF index ef83beb..3f56ea6 100644 --- a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xsl.ui;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.301.qualifier Bundle-Activator: org.eclipse.wst.xsl.ui.internal.XSLUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java index 1dcee8d..15fc40a 100644 --- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java +++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
@@ -272,7 +272,9 @@ for (int nodecnt = 0; nodecnt < nodes.getLength(); nodecnt++) { Node node = nodes.item(nodecnt); - String variableName = "$" + node.getAttributes().getNamedItem("name").getNodeValue(); //$NON-NLS-1$ //$NON-NLS-2$ + Node nameItem = node.getAttributes().getNamedItem("name"); //$NON-NLS-1$ + if (nameItem == null) continue; + String variableName = "$" + nameItem.getNodeValue(); //$NON-NLS-1$ CustomCompletionProposal proposal = new CustomCompletionProposal( variableName, offset, 0, startLength