[tomcat] branch 8.5.x updated: Fix Nio/Nio2Channel's toString() throwing NPE in some cases (#671)

[lihan]

This is an automated email from the ASF dual-hosted git repository.

lihan 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 9b3c28da7e Fix Nio/Nio2Channel's toString() throwing NPE in some cases 
(#671)
9b3c28da7e is described below

commit 9b3c28da7ec8ddbd721b127f7f3b0a7d475ab797
Author: chenggwang <90715678+chenggw...@users.noreply.github.com>
AuthorDate: Thu Oct 26 10:33:14 2023 +0800

    Fix Nio/Nio2Channel's toString() throwing NPE in some cases (#671)
    
    * Fix NioChannel and Nio2Channel's toString() throwing NPE in some cases
    
    NioChannel's toString() causes NioEndpoint's setSocketOptions method to 
throw a NullPointerException in some scenarios (e.g. idea breakpoint debugging).
    
    (cherry picked from commit 3ef8fb6fb6fda60dce304ba4842a5b32dc28b459)
---
 java/org/apache/tomcat/util/net/Nio2Channel.java | 2 +-
 java/org/apache/tomcat/util/net/NioChannel.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java 
b/java/org/apache/tomcat/util/net/Nio2Channel.java
index a2612fd0c1..181f12913c 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -136,7 +136,7 @@ public class Nio2Channel implements AsynchronousByteChannel 
{
 
     @Override
     public String toString() {
-        return super.toString() + ":" + sc.toString();
+        return super.toString() + ":" + sc;
     }
 
     @Override
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
b/java/org/apache/tomcat/util/net/NioChannel.java
index 8e3cb4f0e1..96493ed75a 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -203,7 +203,7 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
 
     @Override
     public String toString() {
-        return super.toString() + ":" + sc.toString();
+        return super.toString() + ":" + sc;
     }
 
     public int getOutboundRemaining() {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org