From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Sat, 16 Jan 2016 23:21:38 +0000 (+0100)
Subject: AllocatedXid assigned incorrectly
X-Git-Tag: release/boron~24
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1404783ae3f3ecfbff27196a1c6ef0a3b74b1a72;p=openflowjava.git

AllocatedXid assigned incorrectly

 - allocatedXid should be set as endXid of the last unflushed segment
 - incorrect allocatedXid resulted in unnecessary segment creation

Change-Id: I040e4bd3f58ace6a911349b04eea2c2793372aa0
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
index 54e779ea..a32c1ad1 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
@@ -66,7 +66,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
             unflushedSegments.add(newSegment);
         }
 
-        allocatedXid = uncompletedSegments.get(uncompletedSegments.size() - 1).getEndXid();
+        allocatedXid = unflushedSegments.get(unflushedSegments.size() - 1).getEndXid();
     }
 
     /*