Merge pull request #571 from aws/staging/47bfc295-5f66-4fda-a44d-d8bc6fbb936c

Pull request: release <- staging/47bfc295-5f66-4fda-a44d-d8bc6fbb936c

Author: aws-sdk-java-automation

.changes/2.7.14.json

@@ -0,0 +1,16 @@
+{
+    "version": "2.7.14",
+    "date": "2019-07-29",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Netty NIO Http Client",
+            "description": "Update `HandlerRemovingChannelPool` to only remove per request handlers if the channel is open or registered to avoid the race condition when the DefaultChannelPipeline is trying to removing the handler at the same time, causing `NoSuchElementException`."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeCommit",
+            "description": "This release supports better exception handling for merges."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,12 @@
+# __2.7.14__ __2019-07-29__
+## __AWS CodeCommit__
+  - ### Features
+    - This release supports better exception handling for merges.
+
+## __Netty NIO Http Client__
+  - ### Bugfixes
+    - Update `HandlerRemovingChannelPool` to only remove per request handlers if the channel is open or registered to avoid the race condition when the DefaultChannelPipeline is trying to removing the handler at the same time, causing `NoSuchElementException`.
+
 # __2.7.13__ __2019-07-26__
 ## __AWS Batch__
   - ### Features

README.md

@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.7.13</version>
+      <version>2.7.14</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.7.13</version>
+  <version>2.7.14</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.7.13</version>
+  <version>2.7.14</version>
 </dependency>
 ```
 
@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.7.13</version>
+  <version>2.7.14</version>
 </dependency>
 ```
 

aws-sdk-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

core/annotations/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/auth/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>profiles</artifactId>

core/protocols/aws-cbor-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-ion-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-query-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-xml-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/regions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>regions</artifactId>

core/sdk-core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

http-client-spi/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>

http-clients/apache-client/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
 
     <artifactId>apache-client</artifactId>

http-clients/netty-nio-client/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.13</version>
+        <version>2.7.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -70,10 +70,17 @@ public void close() {
 
     private void removePerRequestHandlers(Channel channel) {
         channel.attr(IN_USE).set(false);
-        removeIfExists(channel.pipeline(),
-                       HttpStreamsClientHandler.class,
-                       ResponseHandler.class,
-                       ReadTimeoutHandler.class,
-                       WriteTimeoutHandler.class);
+
+        // Only remove per request handler if the channel is registered
+        // or open since DefaultChannelPipeline would remove handlers if
+        // channel is closed and unregistered
+        // See DefaultChannelPipeline.java#L1403
+        if (channel.isOpen() || channel.isRegistered()) {
+            removeIfExists(channel.pipeline(),
+                           HttpStreamsClientHandler.class,
+                           ResponseHandler.class,
+                           ReadTimeoutHandler.class,
+                           WriteTimeoutHandler.class);
+        }
     }
 }

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java

@@ -20,6 +20,7 @@
 import io.netty.channel.ChannelPipeline;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 
@@ -37,7 +38,13 @@ private ChannelUtils() {}
     public static void removeIfExists(ChannelPipeline pipeline, Class<? extends ChannelHandler>... handlers) {
         for (Class<? extends ChannelHandler> handler : handlers) {
             if (pipeline.get(handler) != null) {
-                pipeline.remove(handler);
+                try {
+                    pipeline.remove(handler);
+                } catch (NoSuchElementException exception) {
+                    // There could still be race condition when channel gets
+                    // closed right after removeIfExists is invoked. Ignoring
+                    // NoSuchElementException for that edge case.
+                }
             }
         }
     }