CR: Catch ChannelException and rethrow as IOException

original-brownbear · original-brownbear · commit 759f4550bd78 · 2018-10-20T19:12:10.000+02:00
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java
@@ -20,8 +20,10 @@
 package org.elasticsearch.transport.netty4;
 
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPromise;
+import java.io.IOException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -71,9 +73,13 @@ public void addCloseListener(ActionListener<Void> listener) {
     }
 
     @Override
-    public void setSoLinger(int value) {
+    public void setSoLinger(int value) throws IOException {
         if (channel.isOpen()) {
-            channel.config().setOption(ChannelOption.SO_LINGER, value);
+            try {
+                channel.config().setOption(ChannelOption.SO_LINGER, value);
+            } catch (ChannelException e) {
+                throw new IOException(e);
+            }
         }
     }
 
