From df580812c549e40166392a6bc5b011fe1ab8b46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E6=99=BA=E5=86=AC?= Date: Sun, 1 Sep 2019 06:09:43 +0800 Subject: [PATCH 1/3] fix typo fix typo --- src/java/org/apache/cassandra/auth/RoleOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/auth/RoleOptions.java b/src/java/org/apache/cassandra/auth/RoleOptions.java index 1205d34f9b65..b00aa3f58592 100644 --- a/src/java/org/apache/cassandra/auth/RoleOptions.java +++ b/src/java/org/apache/cassandra/auth/RoleOptions.java @@ -107,7 +107,7 @@ public Optional> getCustomOptions() * - Ensure that only a subset of the options supported by the configured IRoleManager are set * - Validate the type of any option values present. * Should either condition fail, then InvalidRequestException is thrown. This method is called - * during validation of CQL statements, so the IRE results in a error response to the client. + * during validation of CQL statements, so the IRE results in an error response to the client. * * @throws InvalidRequestException if any options which are not supported by the configured IRoleManager * are set or if any option value is of an incorrect type. From f7808ff8e9337255defbbdeae20ad94f250aea9d Mon Sep 17 00:00:00 2001 From: KangZhiDong Date: Thu, 5 Sep 2019 01:09:06 +0800 Subject: [PATCH 2/3] fix typo --- .../org/apache/cassandra/net/InboundConnectionInitiator.java | 2 +- src/java/org/apache/cassandra/transport/Server.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java b/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java index c390ba4287e2..93cd5c7d7488 100644 --- a/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java +++ b/src/java/org/apache/cassandra/net/InboundConnectionInitiator.java @@ -479,7 +479,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) t if (SslHandler.isEncrypted(in)) { - // Connection uses SSL/TLS, replace the detection handler with a SslHandler and so use encryption. + // Connection uses SSL/TLS, replace the detection handler with an SslHandler and so use encryption. SslContext sslContext = SSLFactory.getOrCreateSslContext(encryptionOptions, true, SSLFactory.SocketType.SERVER); Channel channel = ctx.channel(); InetSocketAddress peer = encryptionOptions.require_endpoint_verification ? (InetSocketAddress) channel.remoteAddress() : null; diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java index c4690f157872..2f5583011656 100644 --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@ -486,7 +486,7 @@ protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteB } if (SslHandler.isEncrypted(byteBuf)) { - // Connection uses SSL/TLS, replace the detection handler with a SslHandler and so use + // Connection uses SSL/TLS, replace the detection handler with an SslHandler and so use // encryption. SslHandler sslHandler = createSslHandler(channel.alloc()); channelHandlerContext.pipeline().replace(this, "ssl", sslHandler); From 7c395fd9adc3947f4254efaa76320cd4f431588e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E6=99=BA=E5=86=AC?= Date: Sat, 6 Mar 2021 21:38:50 +0800 Subject: [PATCH 3/3] Update Server.java --- src/java/org/apache/cassandra/transport/Server.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java index 38c30f656dd4..5c9e57533d3d 100644 --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@ -320,7 +320,6 @@ Map countConnectedClientsByUser() } - private static class LatestEvent { public final Event.StatusChange.Status status;