This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f66c10f Align with 9.0.x onwards
f66c10f is described below
commit f66c10fe14eca366486169f4fa2172382d4a8583
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Feb 17 10:10:15 2022 +0000
Align with 9.0.x onwards
---
java/org/apache/tomcat/util/net/SecureNio2Channel.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 1f537e4..0ebc702 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -58,24 +58,24 @@ public class SecureNio2Channel extends Nio2Channel {
// various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+ protected final Nio2Endpoint endpoint;
+
protected ByteBuffer netInBuffer;
protected ByteBuffer netOutBuffer;
protected SSLEngine sslEngine;
- protected final Nio2Endpoint endpoint;
protected volatile boolean sniComplete = false;
- private volatile boolean handshakeComplete;
+ private volatile boolean handshakeComplete = false;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
- private volatile boolean unwrapBeforeRead;
-
protected boolean closed;
protected boolean closing;
private final Map<String,List<String>> additionalTlsAttributes = new
HashMap<>();
+ private volatile boolean unwrapBeforeRead;
private final CompletionHandler<Integer, SocketWrapperBase<Nio2Channel>>
handshakeReadCompletionHandler;
private final CompletionHandler<Integer, SocketWrapperBase<Nio2Channel>>
handshakeWriteCompletionHandler;
@@ -1268,4 +1268,4 @@ public class SecureNio2Channel extends Nio2Channel {
public ByteBuffer getEmptyBuf() {
return emptyBuf;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
