diff options
author | crogers | 2010-04-27 22:05:47 +0000 |
---|---|---|
committer | crogers | 2010-04-27 22:05:47 +0000 |
commit | 0a44b2984ce3dad605b556d499e59034c6053f81 (patch) | |
tree | 1c173307235628031ac1c2b678ae1dbf49067b8d /jsf | |
parent | f3170be60d41f89aa8578825e6c337440214e347 (diff) | |
download | webtools.jsf-0a44b2984ce3dad605b556d499e59034c6053f81.tar.gz webtools.jsf-0a44b2984ce3dad605b556d499e59034c6053f81.tar.xz webtools.jsf-0a44b2984ce3dad605b556d499e59034c6053f81.zip |
[Bug 310702] NPE in JSPModelProcessor.processAttributes() during EL validation tests
Diffstat (limited to 'jsf')
-rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml | 3 | ||||
-rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml index 195a9a484..477746f5c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml @@ -377,6 +377,9 @@ <content-type contentTypeId="org.eclipse.jst.jsp.core.jspsource"> </content-type> + <content-type + contentTypeId="org.eclipse.jst.jsp.core.jspfragmentsource"> + </content-type> </tagRegistry> </extension> <extension diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java index 33b69146e..82807177c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java @@ -477,6 +477,13 @@ public class JSPModelProcessor getApplicationMap().clear(); getRequestMap().clear(); getSessionMap().clear(); + + if (taglibResolver == null) { + // unusual, but protect against possible NPE + JSFCorePlugin.log(IStatus.ERROR, "Program Error: taglib resolver is null."); //$NON-NLS-1$ + return; + } + //long curTime = System.currentTimeMillis(); recurseChildNodes(model, document.getChildNodes(), taglibResolver); //long netTime = System.currentTimeMillis() - curTime; |