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%2FStackedOutboundQueue.java;h=1da6dd3dff01203d3eaea854924c05a18e902ec6;hb=deca37b27340c6e9b1576c281982d5d7f4ee1795;hp=efe71aa77ec3f484ec7ae43c76a2367611837e32;hpb=e35d417dacc1bf002076e432b575931e15769f65;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java
index efe71aa7..1da6dd3d 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java
@@ -34,7 +34,7 @@ final class StackedOutboundQueue implements OutboundQueue {
     private final List<StackedSegment> unflushedSegments = new ArrayList<>(2);
     @GuardedBy("unflushedSegments")
     private final List<StackedSegment> uncompletedSegments = new ArrayList<>(2);
-    private final OutboundQueueManager<?> manager;
+    private final AbstractOutboundQueueManager<?> manager;
 
     private volatile long allocatedXid = -1;
     private volatile long barrierXid = -1;
@@ -46,7 +46,7 @@ final class StackedOutboundQueue implements OutboundQueue {
     // Accessed from Netty only
     private int flushOffset;
 
-    StackedOutboundQueue(final OutboundQueueManager<?> manager) {
+    StackedOutboundQueue(final AbstractOutboundQueueManager<?> manager) {
         this.manager = Preconditions.checkNotNull(manager);
         firstSegment = StackedSegment.create(0L);
         uncompletedSegments.add(firstSegment);
@@ -243,9 +243,8 @@ final class StackedOutboundQueue implements OutboundQueue {
         if (bXid >= fXid) {
             LOG.debug("Barrier found at XID {} (currently at {})", bXid, fXid);
             return null;
-        } else {
-            return reserveEntry();
         }
+        return reserveEntry();
     }
 
     boolean pairRequest(final OfHeader message) {