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 2022/05/19 13:12:53 UTC
[tomcat] branch 8.5.x updated (7cdce2a6ea -> 818a7a0378)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 7cdce2a6ea The ObjectStreamClass memory leak has been fixed in newer JREs
new 26e2184e7f refine the log message
new bb0a027910 change the tense of the localstrings from complete to in progress
new 818a7a0378 Remove unnecessary code
The 3 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/tribes/transport/nio/NioReplicationTask.java | 3 ---
java/org/apache/coyote/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Remove unnecessary code
Posted by ma...@apache.org.
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
commit 818a7a03788477284ca7376026e400ab54961ea4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 19 14:03:40 2022 +0100
Remove unnecessary code
---
java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index fb0d213377..24366d258b 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -165,7 +165,6 @@ public class NioReplicationTask extends AbstractRxTask {
reader.access();
ReadableByteChannel channel = (ReadableByteChannel) key.channel();
int count=-1;
- buffer.clear(); // make buffer empty
SocketAddress saddr = null;
if (channel instanceof SocketChannel) {
@@ -279,8 +278,6 @@ public class NioReplicationTask extends AbstractRxTask {
public void run() {
try {
if (key.isValid()) {
- // cycle the selector so this key is active again
- key.selector().wakeup();
// resume interest in OP_READ, OP_WRITE
int resumeOps = key.interestOps() | SelectionKey.OP_READ;
key.interestOps(resumeOps);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: change the tense of the localstrings from complete to in progress
Posted by ma...@apache.org.
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
commit bb0a0279104924935ff60a5af9b258157c80ea9b
Author: Zishuo Ding <zi...@encs.concordia.ca>
AuthorDate: Wed May 11 11:06:02 2022 -0400
change the tense of the localstrings from complete to in progress
---
java/org/apache/coyote/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/LocalStrings.properties b/java/org/apache/coyote/LocalStrings.properties
index 3fa1192899..4f110d4112 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -37,7 +37,7 @@ abstractProtocol.closeConnectionsAwait=Waiting [{0}] milliseconds for existing c
abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named [{0}] from MBean server [{1}]
abstractProtocol.processorRegisterError=Error registering request processor
abstractProtocol.processorUnregisterError=Error unregistering request processor
-abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting processors
+abstractProtocol.waitingProcessor.add=Adding processor [{0}] to waiting processors
abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting processors
abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: refine the log message
Posted by ma...@apache.org.
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
commit 26e2184e7f43bd8512fe5a4652651a96c3b181c5
Author: Zishuo Ding <zi...@encs.concordia.ca>
AuthorDate: Wed May 11 11:03:59 2022 -0400
refine the log message
---
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index 93d35769e6..25e36bd500 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -448,7 +448,7 @@ public class Registry implements RegistryMBean, MBeanRegistration {
} else {
server = ManagementFactory.getPlatformMBeanServer();
if (log.isDebugEnabled()) {
- log.debug("Creating MBeanServer" + (System.currentTimeMillis() - t1));
+ log.debug("Created MBeanServer" + (System.currentTimeMillis() - t1));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org