1 files changed, 11 insertions, 13 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
index c41f361e..cce85156 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
@@ -17,32 +17,30 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cmscore.ldap;
 
-
 import com.netscape.certsrv.base.SessionContext;
 import com.netscape.certsrv.ldap.ELdapException;
 import com.netscape.certsrv.publish.ILdapExpression;
 import com.netscape.certsrv.request.IRequest;
 
-
 /**
- * This class represents an expression of the form
- * <var1 op val1 AND var2 op va2>.
- *
+ * This class represents an expression of the form <var1 op val1 AND var2 op
+ * va2>.
+ * 
  * Expressions are used as predicates for publishing rule selection.
- *
+ * 
  * @author mzhao
  * @version $Revision$, $Date$
  */
 public class LdapAndExpression implements ILdapExpression {
     private ILdapExpression mExp1;
     private ILdapExpression mExp2;
+
     public LdapAndExpression(ILdapExpression exp1, ILdapExpression exp2) {
         mExp1 = exp1;
         mExp2 = exp2;
     }
 
-    public boolean evaluate(SessionContext sc)
-        throws ELdapException {
+    public boolean evaluate(SessionContext sc) throws ELdapException {
         // If an expression is missing we assume applicability.
         if (mExp1 == null && mExp2 == null)
             return true;
@@ -50,12 +48,12 @@ public class LdapAndExpression implements ILdapExpression {
             return mExp1.evaluate(sc) && mExp2.evaluate(sc);
         else if (mExp1 == null)
             return mExp2.evaluate(sc);
-        else // (if mExp2 == null)
+        else
+            // (if mExp2 == null)
             return mExp1.evaluate(sc);
     }
 
-    public boolean evaluate(IRequest req)
-        throws ELdapException {
+    public boolean evaluate(IRequest req) throws ELdapException {
         // If an expression is missing we assume applicability.
         if (mExp1 == null && mExp2 == null)
             return true;
@@ -63,7 +61,8 @@ public class LdapAndExpression implements ILdapExpression {
             return mExp1.evaluate(req) && mExp2.evaluate(req);
         else if (mExp1 == null)
             return mExp2.evaluate(req);
-        else // (if mExp2 == null)
+        else
+            // (if mExp2 == null)
             return mExp1.evaluate(req);
     }
 
@@ -71,4 +70,3 @@ public class LdapAndExpression implements ILdapExpression {
         return mExp1.toString() + " AND " + mExp2.toString();
     }
 }
-