BUG 2245 - Fixed Collapsible If Statements

Change-Id: Idee4d65869ed7041fde16706b4fb8bea2f77bfdd
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ChannelOutboundQueue.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ChannelOutboundQueue.java
index cc7abcae4ab12f288df027b8cd49966f7069b56f..2d50ff2bf818dae8fd65e891622f515a8afa4436 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ChannelOutboundQueue.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ChannelOutboundQueue.java
@@ -202,12 +202,10 @@ final class ChannelOutboundQueue extends ChannelInboundHandlerAdapter {
              *      should be able to perform dynamic adjustments here.
              *      is that additional complexity needed, though?
              */
-            if ((messages % WORKTIME_RECHECK_MSGS) == 0) {
-                if (System.nanoTime() >= deadline) {
-                    LOG.trace("Exceeded allotted work time {}us",
-                            TimeUnit.NANOSECONDS.toMicros(maxWorkTime));
-                    break;
-                }
+            if ((messages % WORKTIME_RECHECK_MSGS) == 0 && System.nanoTime() >= deadline) {
+                LOG.trace("Exceeded allotted work time {}us",
+                        TimeUnit.NANOSECONDS.toMicros(maxWorkTime));
+                break;
             }
         }