Merge branch 'master' into remove-medialive

Author: dagnir

.changes/next-release/bugfix-AWSSDKforJavav2-5b0301e.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Fix leak of bytebuf on HTTP GoAway"
+}

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/GoAwayException.java

@@ -15,9 +15,7 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
-import io.netty.buffer.ByteBuf;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 
 /**
@@ -27,10 +25,10 @@
 public class GoAwayException extends IOException {
     private final String message;
 
-    GoAwayException(long errorCode, ByteBuf debugData) {
+    GoAwayException(long errorCode, String debugData) {
         this.message = String.format("GOAWAY received from service, requesting this stream be closed. "
                                      + "Error Code = %d, Debug Data = %s",
-                                     errorCode, debugData.toString(StandardCharsets.UTF_8));
+                                     errorCode, debugData);
     }
 
     @Override

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListener.java

@@ -19,6 +19,7 @@
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http2.Http2ConnectionAdapter;
 import io.netty.handler.codec.http2.Http2GoAwayFrame;
+import java.nio.charset.StandardCharsets;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
 import software.amazon.awssdk.utils.Logger;
@@ -41,7 +42,7 @@ public Http2GoAwayEventListener(Channel parentChannel) {
     @Override
     public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData) {
         Http2MultiplexedChannelPool channelPool = parentChannel.attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL).get();
-        GoAwayException exception = new GoAwayException(errorCode, debugData.retain());
+        GoAwayException exception = new GoAwayException(errorCode, debugData.toString(StandardCharsets.UTF_8));
         if (channelPool != null) {
             channelPool.handleGoAway(parentChannel, lastStreamId, exception);
         } else {

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java

@@ -15,13 +15,15 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -53,16 +55,20 @@ public void setup() {
     @Test
     public void goAwayWithNoChannelPoolRecordRaisesNoExceptions() throws Exception {
         when(attribute.get()).thenReturn(null);
-        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, Unpooled.EMPTY_BUFFER);
+        ByteBuf emptyBuffer = Unpooled.EMPTY_BUFFER;
+        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, emptyBuffer);
         verify(channelPipeline).fireExceptionCaught(isA(GoAwayException.class));
+        assertEquals(1, emptyBuffer.refCnt());
     }
 
     @Test
     public void goAwayWithChannelPoolRecordPassesAlongTheFrame() throws Exception {
         Http2MultiplexedChannelPool record = mock(Http2MultiplexedChannelPool.class);
         when(attribute.get()).thenReturn(record);
-        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, Unpooled.EMPTY_BUFFER);
+        ByteBuf emptyBuffer = Unpooled.EMPTY_BUFFER;
+        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, emptyBuffer);
         verify(record).handleGoAway(eq(channel), eq(0), isA(GoAwayException.class));
         verifyNoMoreInteractions(record);
+        assertEquals(1, emptyBuffer.refCnt());
     }
 }