summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbateman2013-04-24 13:10:34 (EDT)
committercbateman2013-04-24 13:10:34 (EDT)
commit9da19d805637ac305e13e46160b97a26a3216518 (patch)
tree056fa3fe16651543e792add20b6627a541a99561
parent02aa10a0a7014c8278c0ad59f0c34068531e2ecb (diff)
downloadwebtools.jsf-9da19d805637ac305e13e46160b97a26a3216518.zip
webtools.jsf-9da19d805637ac305e13e46160b97a26a3216518.tar.gz
webtools.jsf-9da19d805637ac305e13e46160b97a26a3216518.tar.bz2
Fix for fix for 390867 per reopen.
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistParser.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistParser.java
index 7a3e961..6472104 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistParser.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistParser.java
@@ -116,7 +116,7 @@ public final class ContentAssistParser
}
private static String substring(String s, Region r) {
- if (s == null && s.isEmpty())
+ if (s == null || s.isEmpty())
{
return ""; //$NON-NLS-1$
}