X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fcore%2Fconnection%2FOutboundQueueManager.java;h=1769facefa4f597c487dbfcb479e9ad13e01edaf;hb=HEAD;hp=90db23da65d3dfa37b245edf3ce1b6af5d7fd951;hpb=0be233687a9253f8ffc6c3054a2e10b25063f095;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java
index 90db23da..1769face 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java
@@ -86,16 +86,11 @@ final class OutboundQueueManager<T extends OutboundQueueHandler> extends
             return;
         }
 
-        final long now = System.nanoTime();
-        final long sinceLast = now - lastBarrierNanos;
-        if (sinceLast >= maxBarrierNanos) {
-            LOG.debug("Last barrier at {} now {}, elapsed {}", lastBarrierNanos, now, sinceLast);
-            // FIXME: we should be tracking requests/responses instead of this
-            if (nonBarrierMessages == 0) {
-                LOG.trace("No messages written since last barrier, not issuing one");
-            } else {
-                scheduleBarrierMessage();
-            }
+        if (currentQueue.isBarrierNeeded()) {
+            LOG.trace("Sending a barrier message");
+            scheduleBarrierMessage();
+        } else {
+            LOG.trace("Barrier not needed, not issuing one");
         }
     }