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/policy | |
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/policy')
-rw-r--r-- | base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index f6c01b041..579d9ff5b 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -75,6 +75,7 @@ public class PolicyPredicateParser { Debug.trace("Malformed expression: " + predicateExpression); throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_BAD_POLICY_EXPRESSION", predicateExpression)); } + IExpression current = parseExpression(token); boolean malformed = false; Vector<IExpression> expSet = new Vector<IExpression>(); @@ -276,7 +277,7 @@ class PredicateTokenizer { return (currentIndex != -1); } - public String nextToken() { + public String nextToken() throws EPolicyException { if (nextToken != null) { String toReturn = nextToken; @@ -324,8 +325,9 @@ class PredicateTokenizer { } } else { // Cannot happen; Assert here. - toReturn = null; - System.out.println("We shouldn't be here!"); + if (Debug.ON) + Debug.trace("Malformed Predicate Expression : No Tokens"); + throw new EPolicyException("Malformed Predicate Expression : No Tokens"); } if (toReturn == null) return null; |