Author: akazakov
Date: 2012-09-13 13:52:24 -0400 (Thu, 13 Sep 2012)
New Revision: 43662
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-12609 NPE when validating EL which uses
java.util.Map
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-13
17:49:36 UTC (rev 43661)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-13
17:52:24 UTC (rev 43662)
@@ -487,7 +487,9 @@
return;
}
LexicalToken token = segment.getToken();
-
+ if(token==null) {
+ WebKbPlugin.getDefault().logError("The token from unresolved segment is null. EL:
[" + operand + "]");
+ }
varName = token.getText();
if(varName == null) {
//This is syntax error case. Reported by parser.
@@ -539,8 +541,8 @@
if(u != null) {
try {
el = u.getElementAt(startPosition);
- } catch (CoreException exc) {
- CommonPlugin.getDefault().logError(exc);
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
}
}
}