diff options
author | Abhishek Koneru <akoneru@redhat.com> | 2012-05-31 17:04:47 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-06-05 14:46:04 -0500 |
commit | c2128339ba046ceb7ab32954ae07dbb4b41d4e73 (patch) | |
tree | 78b83b2992faa71ad57e83d60b25dda1470c4a0b /base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java | |
parent | 500fe4441a5d458818138cc9b536c3b19ac23dc8 (diff) | |
download | pki-c2128339ba046ceb7ab32954ae07dbb4b41d4e73.tar.gz pki-c2128339ba046ceb7ab32954ae07dbb4b41d4e73.tar.xz pki-c2128339ba046ceb7ab32954ae07dbb4b41d4e73.zip |
Fixes for Null_Returns Cases - 1 For Commit
Diffstat (limited to 'base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java')
-rw-r--r-- | base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index b0505c16b..71f889895 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -274,7 +274,7 @@ class PredicateTokenizer { return (currentIndex != -1); } - public String nextToken() { + public String nextToken() throws ELdapException { if (nextToken != null) { String toReturn = nextToken; @@ -322,8 +322,9 @@ class PredicateTokenizer { } } else { // Cannot happen; Assert here. - toReturn = null; - System.out.println("We shouldn't be here!"); + if (Debug.ON) + Debug.trace("Malformed expression: Null Token"); + throw new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_LDAP_EXPRESSION")); } if (toReturn == null) return null; |