Skip to content
Permalink
Browse files
Merge branch 'cassandra-4.0' into cassandra-4.1
  • Loading branch information
driftx committed May 24, 2022
2 parents 951aff2 + 7ea2471 commit 00250199c0bbfc8c9cae367f835f9075354c6b91
Showing 2 changed files with 4 additions and 0 deletions.
@@ -168,6 +168,7 @@
* GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
* Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 (CASSANDRA-17040)
Merged from 4.0:
* silence benign SslClosedEngineException (CASSANDRA-17565)
Merged from 3.11:
Merged from 3.0:
* Fix issue where frozen maps may not be serialized in the correct order (CASSANDRA-17623)
@@ -53,6 +53,7 @@
import io.netty.channel.unix.Errors;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.ssl.SslClosedEngineException;
import io.netty.util.concurrent.DefaultEventExecutorChooserFactory;
import io.netty.util.concurrent.DefaultThreadFactory;
import io.netty.util.concurrent.RejectedExecutionHandlers;
@@ -293,6 +294,8 @@ static boolean isConnectionReset(Throwable t)
{
if (t instanceof ClosedChannelException)
return true;
if (t instanceof SslClosedEngineException)
return true;
if (t instanceof ConnectException)
return true;
if (t instanceof Errors.NativeIoException)

0 comments on commit 0025019

Please sign in to comment.