Author: akazakov Date: 2011-08-02 16:36:26 -0400 (Tue, 02 Aug 2011) New Revision: 33458 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/resolver/JavaMemberELSegmentImpl.java Log: JBIDE-9414 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 2011-08-02 17:06:03 UTC (rev 33457) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2011-08-02 20:36:26 UTC (rev 33458) @@ -544,7 +544,9 @@ proposals.add(proposal); } - segment.setMemberInfo(bijectedAttribute!=null?bijectedAttribute:member); + if(member!=null || bijectedAttribute!=null) { + segment.setMemberInfo(bijectedAttribute!=null?bijectedAttribute:member); + } segment.getVariables().add(var); } // <<<=== JBIDE-512, JBIDE-2541 related changes Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-08-02 17:06:03 UTC (rev 33457) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-08-02 20:36:26 UTC (rev 33458) @@ -145,7 +145,9 @@ */ public void setMemberInfo(MemberInfo memberInfo) { this.memberInfo = memberInfo; - this.setElement(memberInfo != null ? memberInfo.getJavaElement() : null); + if(memberInfo!=null && memberInfo.getJavaElement()!=null) { + this.setElement(memberInfo.getJavaElement()); + } } /**