ZOOKEEPER-993. Code improvements (MIS via fpj)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1082178 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -188,6 +188,8 @@ BUGFIXES:
 
   ZOOKEEPER-1007. iarchive leak in C client (jeremy stribling via mahadev)
 
+  ZOOKEEPER-993. Code improvements (MIS via fpj)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

@@ -507,17 +507,13 @@ public class FastLeaderElection implements Election {
      * @param zxid  Last zxid observed by the issuer of this vote
      */
     private boolean totalOrderPredicate(long newId, long newZxid, long curId, long curZxid) {
-        LOG.debug("id: " + newId + ", proposed id: " + curId + ", zxid: " + newZxid + ", proposed zxid: " + curZxid);
+        LOG.debug("id: " + newId + ", proposed id: " + curId + ", zxid: " + 
+                newZxid + ", proposed zxid: " + curZxid);
         if(self.getQuorumVerifier().getWeight(newId) == 0){
             return false;
         }
-
-        if ((newZxid > curZxid)
-                || ((newZxid == curZxid) && (newId > curId)))
-            return true;
-        else
-            return false;
-
+        
+        return ((newZxid > curZxid) || ((newZxid == curZxid) && (newId > curId)));
     }
 
     /**
@@ -544,11 +540,7 @@ public class FastLeaderElection implements Election {
             }
         }
 
-        if(self.getQuorumVerifier().containsQuorum(set))
-            return true;
-        else
-            return false;
-
+        return self.getQuorumVerifier().containsQuorum(set);
     }
 
     /**