commit 4985f2106cdf2455ee98a0c0bd064d0d900a8861
author Ray Milkey <ray@onlab.us> Thu Apr 10 16:57:05 2014 -0700
committer Ray Milkey <ray@onlab.us> Thu Apr 10 16:57:05 2014 -0700
tree 8bc3614c8bf94b4c6fc01feda441cef5b7814c68
parent 0b88a2644964a4f5e45463e3bd8d05b1bfe0929c

Enable checkstyle rule for boolean return statement
that can be simplified.

Enable the "SimplifyBooleanReturn" checkstyle rule and fix
the violations is causes.

Change-Id: I3465c76d863d49ca71895d9c8d55b86e4a37d0f1

src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java

diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
index c34e773..6969480 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -1287,15 +1287,10 @@
 
         if (newEntry.getSysUpTime() > oldEntry.getSysUpTime()) {
             return true;
-        } else if (newEntry.getSysUpTime() == oldEntry.getSysUpTime()) {
-            if (newEntry.getSequenceNum() > oldEntry.getSequenceNum()) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
         }
+
+        return newEntry.getSysUpTime() == oldEntry.getSysUpTime() &&
+               newEntry.getSequenceNum() > oldEntry.getSequenceNum();
     }
 
     // The code below should be reimplemented after removal of Floodlight's