From c2128339ba046ceb7ab32954ae07dbb4b41d4e73 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Thu, 31 May 2012 17:04:47 -0400 Subject: Fixes for Null_Returns Cases - 1 For Commit --- .../netscape/cmscore/ldap/PublisherProcessor.java | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java') diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 62e4b8bef..ab99b4f06 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -493,7 +493,7 @@ public class PublisherProcessor implements //this is the only rule we support now LdapRule rule = (LdapRule) (mRuleInsts.get(name)); - if (rule.enabled() && rule.getType().equals(publishingType)) { + if (rule.enabled() && publishingType.equals(rule.getType())) { // check if the predicate match ILdapExpression exp = rule.getPredicate(); @@ -509,6 +509,7 @@ public class PublisherProcessor implements if (Debug.ON) Debug.trace("added rule " + name + " for " + publishingType); } + } return rules.elements(); } @@ -519,24 +520,13 @@ public class PublisherProcessor implements } Vector rules = new Vector(); - Enumeration e = mRuleInsts.keys(); + Enumeration e = mRuleInsts.elements(); while (e.hasMoreElements()) { - String name = e.nextElement(); - - if (name == null) { - if (Debug.ON) - Debug.trace("rule name is " + "null"); - return null; - } else { - if (Debug.ON) - Debug.trace("rule name is " + name); - } - //this is the only rule we support now - LdapRule rule = (LdapRule) (mRuleInsts.get(name)); + LdapRule rule = (LdapRule) e.nextElement(); - if (rule.enabled() && rule.getType().equals(publishingType)) { + if (rule.enabled() && publishingType.equals(rule.getType())) { // check if the predicate match ILdapExpression exp = rule.getPredicate(); @@ -549,9 +539,10 @@ public class PublisherProcessor implements rules.addElement(rule); if (Debug.ON) - Debug.trace("added rule " + name + " for " + publishingType + + Debug.trace("added rule " + rule.getInstanceName() + " for " + publishingType + " request: " + req.getRequestId()); } + } return rules.elements(); } -- cgit