diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2012-06-05 12:16:51 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-06-05 14:46:08 -0500 |
| commit | 4a012010233b0a5fd613c9d7734ee01be64e3834 (patch) | |
| tree | 53affd70c3c2b5d0d909641f847b938e80e874c7 /base/common/src/com/netscape/cmscore/ldap | |
| parent | c2128339ba046ceb7ab32954ae07dbb4b41d4e73 (diff) | |
| download | pki-4a012010233b0a5fd613c9d7734ee01be64e3834.tar.gz pki-4a012010233b0a5fd613c9d7734ee01be64e3834.tar.xz pki-4a012010233b0a5fd613c9d7734ee01be64e3834.zip | |
Fixes for NULL_RETURN cases review comments
Diffstat (limited to 'base/common/src/com/netscape/cmscore/ldap')
| -rw-r--r-- | base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index 71f889895..8c2b730d5 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -326,15 +326,13 @@ class PredicateTokenizer { Debug.trace("Malformed expression: Null Token"); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_LDAP_EXPRESSION")); } - if (toReturn == null) - return null; - else { - String trimmed = toReturn.trim(); - if (trimmed == null || trimmed.length() == 0) - return nextToken(); - else - return trimmed; - } + String trimmed = toReturn.trim(); + + if (trimmed.length() == 0) + return nextToken(); + else + return trimmed; + } } |