[jbosstools-commits] JBoss Tools SVN: r19710 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model and 1 other directory.
Author: dazarov
Date: 2010-01-12 08:43:15 -0500 (Tue, 12 Jan 2010)
New Revision: 19710
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2010-01-12
12:03:04 UTC (rev 19709)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2010-01-12
13:43:15 UTC (rev 19710)
@@ -129,7 +129,8 @@
ELResolutionImpl resolution = null;
try {
resolution = resolveELOperand(context.getResource(), operand, true, vars, new
ElVarSearcher(context.getResource(), this));
- resolution.setContext(context);
+ if(resolution != null)
+ resolution.setContext(context);
} catch (StringIndexOutOfBoundsException e) {
log(e);
} catch (BadLocationException e) {
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-01-12
12:03:04 UTC (rev 19709)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-01-12
13:43:15 UTC (rev 19710)
@@ -113,7 +113,8 @@
*/
public ELResolution resolve(ELContext context, ELExpression operand, int offset) {
ELResolutionImpl resolution = resolveELOperand(operand, context, true);
- resolution.setContext(context);
+ if(resolution != null)
+ resolution.setContext(context);
return resolution;
}