This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4621febf72 Check for null
4621febf72 is described below
commit 4621febf7217592a0ff84cccc241678cf43e97ab
Author: remm <[email protected]>
AuthorDate: Mon Mar 9 17:00:52 2026 +0100
Check for null
Since reset on close sets the engine to null, improve checks a little.
---
java/org/apache/tomcat/util/net/SecureNioChannel.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index c6b4193a89..b9af1770b1 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -618,7 +618,8 @@ public class SecureNioChannel extends NioChannel {
@Override
public int read(ByteBuffer dst) throws IOException {
// are we in the middle of closing or closed?
- if (closing || closed) {
+ SSLEngine sslEngine = this.sslEngine;
+ if (closing || closed || sslEngine == null) {
return -1;
}
// did we finish our handshake?
@@ -705,7 +706,8 @@ public class SecureNioChannel extends NioChannel {
@Override
public long read(ByteBuffer[] dsts, int offset, int length) throws
IOException {
// are we in the middle of closing or closed?
- if (closing || closed) {
+ SSLEngine sslEngine = this.sslEngine;
+ if (closing || closed || sslEngine == null) {
return -1;
}
// did we finish our handshake?
@@ -836,7 +838,8 @@ public class SecureNioChannel extends NioChannel {
return sc.write(src);
} else {
// Are we closing or closed?
- if (closing || closed) {
+ SSLEngine sslEngine = this.sslEngine;
+ if (closing || closed || sslEngine == null) {
throw new IOException(sm.getString("channel.nio.ssl.closing"));
}
@@ -879,7 +882,8 @@ public class SecureNioChannel extends NioChannel {
public long write(ByteBuffer[] srcs, int offset, int length) throws
IOException {
checkInterruptStatus();
// Are we closing or closed?
- if (closing || closed) {
+ SSLEngine sslEngine = this.sslEngine;
+ if (closing || closed || sslEngine == null) {
throw new IOException(sm.getString("channel.nio.ssl.closing"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
