From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 18 Oct 2018 15:25:55 +0000 (+0200)
Subject: Release the buffer only after we are done with it
X-Git-Tag: release/neon~122
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=92708e68b817912bd6fd6814805017cc24a9875f;p=netconf.git

Release the buffer only after we are done with it

We may end up touching the buffer after we have release()'d it,
which means it may have been recycled by the time we call
resetReaderIndex().

Move the release() call to after the check so we do not end up
releasing it prematurely.

Change-Id: I43156dbe2e6c53a552a322e7b5ea27f8da3873c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java
index bab4a7be63..96e54942df 100644
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java
@@ -106,14 +106,14 @@ public final class AsyncSshHandlerWriter implements AutoCloseable {
                         promise.setFailure(future.getException());
                     }
 
-                    // Not needed anymore, release
-                    byteBufMsg.release();
-
                     //rescheduling message from queue after successfully sent
                     if (wasPending) {
                         byteBufMsg.resetReaderIndex();
                         pending.remove();
                     }
+
+                    // Not needed anymore, release
+                    byteBufMsg.release();
                 }
 
                 // Check pending queue and schedule next