You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/10/16 13:30:39 UTC
[tomcat] branch 9.0.x updated (5c84c6a -> 884ace4)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 5c84c6a Simplify
new cb4e295 SpotBugs - Fix possible NPE
new 884ace4 SpotBugs - simplify
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/ha/backend/TcpSender.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: SpotBugs - Fix possible NPE
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cb4e29509700b837e056cca3c96cb2707ce93c77
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 16 14:21:52 2020 +0100
SpotBugs - Fix possible NPE
---
java/org/apache/catalina/ha/backend/TcpSender.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/backend/TcpSender.java b/java/org/apache/catalina/ha/backend/TcpSender.java
index 5676c88..7e1bda9 100644
--- a/java/org/apache/catalina/ha/backend/TcpSender.java
+++ b/java/org/apache/catalina/ha/backend/TcpSender.java
@@ -151,7 +151,7 @@ public class TcpSender
// read all the headers.
String header = connectionReaders[i].readLine();
int contentLength = 0;
- while (!header.isEmpty()) {
+ while (header != null && !header.isEmpty()) {
int colon = header.indexOf(':');
String headerName = header.substring(0, colon).trim();
String headerValue = header.substring(colon + 1).trim();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: SpotBugs - simplify
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 884ace411f6ae57df1a531a4f8aea7b816789d8b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 16 14:27:46 2020 +0100
SpotBugs - simplify
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 26486be..3754e0a 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -631,7 +631,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
cancelledKey(key, socketWrapper);
}
} else {
- cancelledKey(key, attachment);
+ cancelledKey(key, null);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org