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/08 20:17:17 UTC
[tomcat] branch 9.0.x updated (1e97ab2 -> 0de12f4)
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 1e97ab2 Fix HTTP/2 window updates with zero padding. Found via CI tests
new 87e6865 Align with 10.0.x. No functional change.
new 0de12f4 Align with 10.0.x. No functional change.
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/tomcat/buildutil/translate/Utils.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Align with 10.0.x. No functional change.
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 0de12f4fd6d0b0761a16a0997d313ceb212a1403
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 8 19:48:57 2020 +0100
Align with 10.0.x. No functional change.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7fa25e3..26486be 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -938,8 +938,8 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
try {
for (SelectionKey key : selector.keys()) {
keycount++;
+ NioSocketWrapper socketWrapper = (NioSocketWrapper) key.attachment();
try {
- NioSocketWrapper socketWrapper = (NioSocketWrapper) key.attachment();
if (socketWrapper == null) {
// We don't support any keys without attachments
cancelledKey(key, null);
@@ -987,7 +987,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
}
}
} catch (CancelledKeyException ckx) {
- cancelledKey(key, (NioSocketWrapper) key.attachment());
+ cancelledKey(key, socketWrapper);
}
}
} catch (ConcurrentModificationException cme) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 10.0.x. No functional change.
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 87e686599bc1e034b0d7f393ef1b3ea701332a8b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 8 19:33:50 2020 +0100
Align with 10.0.x. No functional change.
---
java/org/apache/tomcat/buildutil/translate/Utils.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 5eb015f..63d3947 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -73,7 +73,7 @@ public class Utils {
if (result.contains("[{0}]")) {
result = FIX_SINGLE_QUOTE.matcher(result).replaceAll("''");
}
- return result;
+ return result.trim();
}
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 9a8a0aa..7fa25e3 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -134,7 +134,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
public boolean getUseInheritedChannel() { return useInheritedChannel; }
/**
- * Priority of the poller threads.
+ * Priority of the poller thread.
*/
private int pollerThreadPriority = Thread.NORM_PRIORITY;
public void setPollerThreadPriority(int pollerThreadPriority) { this.pollerThreadPriority = pollerThreadPriority; }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org