[GitHub] [tomcat] aooohan closed pull request #523: Polished.
aooohan closed pull request #523: Polished. URL: https://github.com/apache/tomcat/pull/523 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] aooohan commented on pull request #523: Polished.
aooohan commented on PR #523: URL: https://github.com/apache/tomcat/pull/523#issuecomment-1272210074 Merge manually. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Refactor. Simplify 'Map' operations. No functional change.
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 52774c2467 Refactor. Simplify 'Map' operations. No functional change.
52774c2467 is described below
commit 52774c24678f11ca7aadc02d98dca156e8c36b3d
Author: lihan
AuthorDate: Sat Oct 8 11:10:30 2022 +0800
Refactor. Simplify 'Map' operations. No functional change.
---
java/org/apache/catalina/connector/Request.java| 8 ++--
.../catalina/core/ApplicationPushBuilder.java | 8 +---
java/org/apache/catalina/core/StandardContext.java | 23 ++
.../apache/catalina/servlets/WebdavServlet.java| 8 +---
.../util/descriptor/web/SecurityConstraint.java| 8 ++--
java/org/apache/tomcat/util/http/Parameters.java | 7 +--
6 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 40475e8fc5..b1f59767cc 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3401,12 +3401,8 @@ public class Request implements HttpServletRequest {
for (AcceptLanguage acceptLanguage : acceptLanguages) {
// Add a new Locale to the list of Locales for this quality level
Double key = Double.valueOf(-acceptLanguage.getQuality()); //
Reverse the order
-ArrayList values = locales.get(key);
-if (values == null) {
-values = new ArrayList<>();
-locales.put(key, values);
-}
-values.add(acceptLanguage.getLocale());
+locales.computeIfAbsent(key, k -> new ArrayList<>())
+.add(acceptLanguage.getLocale());
}
}
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index 240167c529..42842ef869 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -243,13 +243,7 @@ public class ApplicationPushBuilder implements PushBuilder
{
@Override
public PushBuilder addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
-
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
return this;
}
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index d64f676f9a..5044ed462a 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4891,12 +4891,7 @@ public class StandardContext extends ContainerBase
continue;
}
Integer key = Integer.valueOf(loadOnStartup);
-ArrayList list = map.get(key);
-if (list == null) {
-list = new ArrayList<>();
-map.put(key, list);
-}
-list.add(wrapper);
+map.computeIfAbsent(key, k -> new ArrayList<>()).add(wrapper);
}
// Load the collected "load on startup" servlets
@@ -5303,12 +5298,8 @@ public class StandardContext extends ContainerBase
String jndiName = resource.getName();
for (InjectionTarget injectionTarget: injectionTargets) {
String clazz = injectionTarget.getTargetClass();
-Map injections = injectionMap.get(clazz);
-if (injections == null) {
-injections = new HashMap<>();
-injectionMap.put(clazz, injections);
-}
-injections.put(injectionTarget.getTargetName(), jndiName);
+injectionMap.computeIfAbsent(clazz, k -> new HashMap<>())
+.put(injectionTarget.getTargetName(), jndiName);
}
}
}
@@ -5332,10 +5323,8 @@ public class StandardContext extends ContainerBase
ApplicationParameter params[] = findApplicationParameters();
for (ApplicationParameter param : params) {
if (param.getOverride()) {
-if (mergedParams.get(param.getName()) == null) {
-mergedParams.put(param.getName(),
-param.getValue());
-}
+mergedParams.computeIfAbsent(param.getName(),
+k -> param.getValue());
} else {
mergedParams.put(param.getName(), param.getValue());
}
@@ -5864,7 +5853,7 @@ public class StandardContext extends ContainerBase
parent = parent.getParent();
[tomcat] branch 9.0.x updated: Refactor. Simplify 'Map' operations. No functional change.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 bcb8b1198d Refactor. Simplify 'Map' operations. No functional change.
bcb8b1198d is described below
commit bcb8b1198d7472cb6c8e1e150d5ea2c59092a18a
Author: lihan
AuthorDate: Sat Oct 8 11:10:30 2022 +0800
Refactor. Simplify 'Map' operations. No functional change.
---
java/org/apache/catalina/connector/Request.java| 8 ++--
.../catalina/core/ApplicationPushBuilder.java | 8 +---
java/org/apache/catalina/core/StandardContext.java | 23 ++
.../apache/catalina/servlets/WebdavServlet.java| 8 +---
.../util/descriptor/web/SecurityConstraint.java| 8 ++--
java/org/apache/tomcat/util/http/Parameters.java | 7 +--
6 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index ff599aa848..5816cb6fbc 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3466,12 +3466,8 @@ public class Request implements HttpServletRequest {
for (AcceptLanguage acceptLanguage : acceptLanguages) {
// Add a new Locale to the list of Locales for this quality level
Double key = Double.valueOf(-acceptLanguage.getQuality()); //
Reverse the order
-ArrayList values = locales.get(key);
-if (values == null) {
-values = new ArrayList<>();
-locales.put(key, values);
-}
-values.add(acceptLanguage.getLocale());
+locales.computeIfAbsent(key, k -> new ArrayList<>())
+.add(acceptLanguage.getLocale());
}
}
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index e06b9d3ef8..f910957eef 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -243,13 +243,7 @@ public class ApplicationPushBuilder implements PushBuilder
{
@Override
public PushBuilder addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
-
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
return this;
}
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index ef4ab40c78..4d588cc8dd 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4943,12 +4943,7 @@ public class StandardContext extends ContainerBase
continue;
}
Integer key = Integer.valueOf(loadOnStartup);
-ArrayList list = map.get(key);
-if (list == null) {
-list = new ArrayList<>();
-map.put(key, list);
-}
-list.add(wrapper);
+map.computeIfAbsent(key, k -> new ArrayList<>()).add(wrapper);
}
// Load the collected "load on startup" servlets
@@ -5370,12 +5365,8 @@ public class StandardContext extends ContainerBase
String jndiName = resource.getName();
for (InjectionTarget injectionTarget: injectionTargets) {
String clazz = injectionTarget.getTargetClass();
-Map injections = injectionMap.get(clazz);
-if (injections == null) {
-injections = new HashMap<>();
-injectionMap.put(clazz, injections);
-}
-injections.put(injectionTarget.getTargetName(), jndiName);
+injectionMap.computeIfAbsent(clazz, k -> new HashMap<>())
+.put(injectionTarget.getTargetName(), jndiName);
}
}
}
@@ -5399,10 +5390,8 @@ public class StandardContext extends ContainerBase
ApplicationParameter params[] = findApplicationParameters();
for (ApplicationParameter param : params) {
if (param.getOverride()) {
-if (mergedParams.get(param.getName()) == null) {
-mergedParams.put(param.getName(),
-param.getValue());
-}
+mergedParams.computeIfAbsent(param.getName(),
+k -> param.getValue());
} else {
mergedParams.put(param.getName(), param.getValue());
}
@@ -5931,7 +5920,7 @@ public class StandardContext extends ContainerBase
parent = parent.getParent();
[tomcat] branch 10.0.x updated: Refactor. Simplify 'Map' operations. No functional change.
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 4abc0b5f3b Refactor. Simplify 'Map' operations. No functional change.
4abc0b5f3b is described below
commit 4abc0b5f3b473008527b6d1129e08b8aa8526eb1
Author: lihan
AuthorDate: Sat Oct 8 11:10:30 2022 +0800
Refactor. Simplify 'Map' operations. No functional change.
---
java/org/apache/catalina/connector/Request.java| 8 ++--
.../catalina/core/ApplicationPushBuilder.java | 8 +---
java/org/apache/catalina/core/StandardContext.java | 23 ++
.../apache/catalina/servlets/WebdavServlet.java| 8 +---
.../util/descriptor/web/SecurityConstraint.java| 8 ++--
java/org/apache/tomcat/util/http/Parameters.java | 7 +--
6 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 69e9ce6199..af2f1ccd2f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3434,12 +3434,8 @@ public class Request implements HttpServletRequest {
for (AcceptLanguage acceptLanguage : acceptLanguages) {
// Add a new Locale to the list of Locales for this quality level
Double key = Double.valueOf(-acceptLanguage.getQuality()); //
Reverse the order
-ArrayList values = locales.get(key);
-if (values == null) {
-values = new ArrayList<>();
-locales.put(key, values);
-}
-values.add(acceptLanguage.getLocale());
+locales.computeIfAbsent(key, k -> new ArrayList<>())
+.add(acceptLanguage.getLocale());
}
}
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index 240167c529..42842ef869 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -243,13 +243,7 @@ public class ApplicationPushBuilder implements PushBuilder
{
@Override
public PushBuilder addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
-
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
return this;
}
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 329e9e70c0..40f7ea1b1c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4892,12 +4892,7 @@ public class StandardContext extends ContainerBase
continue;
}
Integer key = Integer.valueOf(loadOnStartup);
-ArrayList list = map.get(key);
-if (list == null) {
-list = new ArrayList<>();
-map.put(key, list);
-}
-list.add(wrapper);
+map.computeIfAbsent(key, k -> new ArrayList<>()).add(wrapper);
}
// Load the collected "load on startup" servlets
@@ -5319,12 +5314,8 @@ public class StandardContext extends ContainerBase
String jndiName = resource.getName();
for (InjectionTarget injectionTarget: injectionTargets) {
String clazz = injectionTarget.getTargetClass();
-Map injections = injectionMap.get(clazz);
-if (injections == null) {
-injections = new HashMap<>();
-injectionMap.put(clazz, injections);
-}
-injections.put(injectionTarget.getTargetName(), jndiName);
+injectionMap.computeIfAbsent(clazz, k -> new HashMap<>())
+.put(injectionTarget.getTargetName(), jndiName);
}
}
}
@@ -5348,10 +5339,8 @@ public class StandardContext extends ContainerBase
ApplicationParameter params[] = findApplicationParameters();
for (ApplicationParameter param : params) {
if (param.getOverride()) {
-if (mergedParams.get(param.getName()) == null) {
-mergedParams.put(param.getName(),
-param.getValue());
-}
+mergedParams.computeIfAbsent(param.getName(),
+k -> param.getValue());
} else {
mergedParams.put(param.getName(), param.getValue());
}
@@ -5880,7 +5869,7 @@ public class StandardContext extends ContainerBase
parent = parent.getParent();
[tomcat] branch 9.0.x updated: Refactor. Simplify code. No functional change.
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 58a83e6593 Refactor. Simplify code. No functional change.
58a83e6593 is described below
commit 58a83e65939f8a45363416a73cd06ca84b8d75f1
Author: Mark Thomas
AuthorDate: Fri Oct 7 19:52:49 2022 +0100
Refactor. Simplify code. No functional change.
---
java/org/apache/catalina/startup/HostConfig.java | 3 +--
java/org/apache/catalina/util/CustomObjectInputStream.java | 3 +--
java/org/apache/catalina/webresources/StandardRoot.java| 4 +---
java/org/apache/coyote/AbstractProtocol.java | 4 +---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 +---
java/org/apache/coyote/http2/AbstractStream.java | 3 +--
java/org/apache/coyote/http2/Http2Protocol.java| 4 +---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 3 +--
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 7 +++
9 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 6991131b99..36a0ce5bac 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -31,7 +31,6 @@ import java.security.PermissionCollection;
import java.security.Policy;
import java.security.cert.Certificate;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -159,7 +158,7 @@ public class HostConfig implements LifecycleListener {
* Set of applications which are being serviced, and shouldn't be
* deployed/undeployed/redeployed at the moment.
*/
-private Set servicedSet = Collections.newSetFromMap(new
ConcurrentHashMap());
+private Set servicedSet = ConcurrentHashMap.newKeySet();
/**
* The Digester instance used to parse context descriptors.
diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java
b/java/org/apache/catalina/util/CustomObjectInputStream.java
index 539b6017b1..4d5e88fe76 100644
--- a/java/org/apache/catalina/util/CustomObjectInputStream.java
+++ b/java/org/apache/catalina/util/CustomObjectInputStream.java
@@ -22,7 +22,6 @@ import java.io.InvalidClassException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Proxy;
-import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -112,7 +111,7 @@ public final class CustomObjectInputStream extends
ObjectInputStream {
reportedClasses = reportedClassCache.get(classLoader);
}
if (reportedClasses == null) {
-reportedClasses = Collections.newSetFromMap(new
ConcurrentHashMap<>());
+reportedClasses = ConcurrentHashMap.newKeySet();
Set original;
synchronized (reportedClassCache) {
original = reportedClassCache.putIfAbsent(classLoader,
reportedClasses);
diff --git a/java/org/apache/catalina/webresources/StandardRoot.java
b/java/org/apache/catalina/webresources/StandardRoot.java
index daa60d55d5..8109a3786f 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -24,7 +24,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -80,8 +79,7 @@ public class StandardRoot extends LifecycleMBeanBase
implements WebResourceRoot
private ObjectName cacheJmxName = null;
private boolean trackLockedFiles = false;
-private final Set trackedResources =
-Collections.newSetFromMap(new ConcurrentHashMap<>());
+private final Set trackedResources =
ConcurrentHashMap.newKeySet();
// Constructs to make iteration over all WebResourceSets simpler
private final List mainResources = new ArrayList<>();
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index b0c1285b9d..40bc2be500 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -18,7 +18,6 @@ package org.apache.coyote;
import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -86,8 +85,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
private Handler handler;
-private final Set waitingProcessors =
-
[tomcat] branch 10.0.x updated: Refactor. Simplify code. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new ccc56a3d9d Refactor. Simplify code. No functional change.
ccc56a3d9d is described below
commit ccc56a3d9d11e8f4e96676aeb7056fc8d504daad
Author: Mark Thomas
AuthorDate: Fri Oct 7 19:52:49 2022 +0100
Refactor. Simplify code. No functional change.
---
java/org/apache/catalina/startup/HostConfig.java | 3 +--
java/org/apache/catalina/util/CustomObjectInputStream.java | 3 +--
java/org/apache/catalina/webresources/StandardRoot.java| 4 +---
java/org/apache/coyote/AbstractProtocol.java | 4 +---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 +---
java/org/apache/coyote/http2/AbstractStream.java | 3 +--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 3 +--
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 7 +++
8 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 4ba2c8f33b..44bce7902e 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -31,7 +31,6 @@ import java.security.PermissionCollection;
import java.security.Policy;
import java.security.cert.Certificate;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -160,7 +159,7 @@ public class HostConfig implements LifecycleListener {
* Set of applications which are being serviced, and shouldn't be
* deployed/undeployed/redeployed at the moment.
*/
-private Set servicedSet = Collections.newSetFromMap(new
ConcurrentHashMap());
+private Set servicedSet = ConcurrentHashMap.newKeySet();
/**
* The Digester instance used to parse context descriptors.
diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java
b/java/org/apache/catalina/util/CustomObjectInputStream.java
index 539b6017b1..4d5e88fe76 100644
--- a/java/org/apache/catalina/util/CustomObjectInputStream.java
+++ b/java/org/apache/catalina/util/CustomObjectInputStream.java
@@ -22,7 +22,6 @@ import java.io.InvalidClassException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Proxy;
-import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -112,7 +111,7 @@ public final class CustomObjectInputStream extends
ObjectInputStream {
reportedClasses = reportedClassCache.get(classLoader);
}
if (reportedClasses == null) {
-reportedClasses = Collections.newSetFromMap(new
ConcurrentHashMap<>());
+reportedClasses = ConcurrentHashMap.newKeySet();
Set original;
synchronized (reportedClassCache) {
original = reportedClassCache.putIfAbsent(classLoader,
reportedClasses);
diff --git a/java/org/apache/catalina/webresources/StandardRoot.java
b/java/org/apache/catalina/webresources/StandardRoot.java
index daa60d55d5..8109a3786f 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -24,7 +24,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -80,8 +79,7 @@ public class StandardRoot extends LifecycleMBeanBase
implements WebResourceRoot
private ObjectName cacheJmxName = null;
private boolean trackLockedFiles = false;
-private final Set trackedResources =
-Collections.newSetFromMap(new ConcurrentHashMap<>());
+private final Set trackedResources =
ConcurrentHashMap.newKeySet();
// Constructs to make iteration over all WebResourceSets simpler
private final List mainResources = new ArrayList<>();
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 271a8add2d..216308e06c 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -18,7 +18,6 @@ package org.apache.coyote;
import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@@ -86,8 +85,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
private Handler handler;
-private final Set waitingProcessors =
-Collections.newSetFromMap(new ConcurrentHashMap<>());
+
[tomcat] branch main updated: Refactor. Simplify code. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7d36e5ce87 Refactor. Simplify code. No functional change.
7d36e5ce87 is described below
commit 7d36e5ce8795ba1674dc447abbce93416bfbfe15
Author: Mark Thomas
AuthorDate: Fri Oct 7 19:52:49 2022 +0100
Refactor. Simplify code. No functional change.
---
java/org/apache/catalina/startup/HostConfig.java | 3 +--
java/org/apache/catalina/util/CustomObjectInputStream.java | 3 +--
java/org/apache/catalina/webresources/StandardRoot.java| 4 +---
java/org/apache/coyote/AbstractProtocol.java | 4 +---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 +---
java/org/apache/coyote/http2/AbstractStream.java | 3 +--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 3 +--
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 7 +++
8 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 2cdff96415..4f079b58a3 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -31,7 +31,6 @@ import java.security.PermissionCollection;
import java.security.Policy;
import java.security.cert.Certificate;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -150,7 +149,7 @@ public class HostConfig implements LifecycleListener {
* Set of applications which are being serviced, and shouldn't be
* deployed/undeployed/redeployed at the moment.
*/
-private Set servicedSet = Collections.newSetFromMap(new
ConcurrentHashMap());
+private Set servicedSet = ConcurrentHashMap.newKeySet();
/**
* The Digester instance used to parse context descriptors.
diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java
b/java/org/apache/catalina/util/CustomObjectInputStream.java
index 49bdb7447e..c6f41cd9da 100644
--- a/java/org/apache/catalina/util/CustomObjectInputStream.java
+++ b/java/org/apache/catalina/util/CustomObjectInputStream.java
@@ -22,7 +22,6 @@ import java.io.InvalidClassException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Proxy;
-import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -112,7 +111,7 @@ public final class CustomObjectInputStream extends
ObjectInputStream {
reportedClasses = reportedClassCache.get(classLoader);
}
if (reportedClasses == null) {
-reportedClasses = Collections.newSetFromMap(new
ConcurrentHashMap<>());
+reportedClasses = ConcurrentHashMap.newKeySet();
Set original;
synchronized (reportedClassCache) {
original = reportedClassCache.putIfAbsent(classLoader,
reportedClasses);
diff --git a/java/org/apache/catalina/webresources/StandardRoot.java
b/java/org/apache/catalina/webresources/StandardRoot.java
index daa60d55d5..8109a3786f 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -24,7 +24,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -80,8 +79,7 @@ public class StandardRoot extends LifecycleMBeanBase
implements WebResourceRoot
private ObjectName cacheJmxName = null;
private boolean trackLockedFiles = false;
-private final Set trackedResources =
-Collections.newSetFromMap(new ConcurrentHashMap<>());
+private final Set trackedResources =
ConcurrentHashMap.newKeySet();
// Constructs to make iteration over all WebResourceSets simpler
private final List mainResources = new ArrayList<>();
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index e21f6b731e..55eb2a7b3c 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -18,7 +18,6 @@ package org.apache.coyote;
import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@@ -86,8 +85,7 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
private Handler handler;
-private final Set waitingProcessors =
-Collections.newSetFromMap(new ConcurrentHashMap<>());
+
[tomcat] branch 8.5.x updated: Remove confusing @version tags from Javadoc
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 278a64a784 Remove confusing @version tags from Javadoc
278a64a784 is described below
commit 278a64a784f44cd0ea6d276135223c4f971917e6
Author: Mark Thomas
AuthorDate: Fri Oct 7 17:49:35 2022 +0100
Remove confusing @version tags from Javadoc
Also includes small amounts of Javadoc clean-up.
---
.../apache/catalina/ha/context/ReplicatedContext.java | 3 ---
java/org/apache/catalina/ha/deploy/FileMessage.java | 3 +--
.../apache/catalina/ha/deploy/FileMessageFactory.java | 2 --
java/org/apache/catalina/ha/deploy/WarWatcher.java | 1 -
java/org/apache/catalina/ha/session/BackupManager.java | 3 ---
java/org/apache/catalina/ha/session/DeltaRequest.java | 1 -
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/catalina/tribes/ChannelException.java | 6 ++
java/org/apache/catalina/tribes/ChannelListener.java| 10 +++---
java/org/apache/catalina/tribes/ErrorHandler.java | 3 ---
java/org/apache/catalina/tribes/Heartbeat.java | 2 +-
java/org/apache/catalina/tribes/MessageListener.java| 9 ++---
.../apache/catalina/tribes/RemoteProcessException.java | 8 +++-
java/org/apache/catalina/tribes/UniqueId.java | 6 +-
.../org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 --
java/org/apache/catalina/tribes/group/GroupChannel.java | 7 +--
.../catalina/tribes/group/InterceptorPayload.java | 3 ---
java/org/apache/catalina/tribes/group/Response.java | 1 -
java/org/apache/catalina/tribes/group/RpcCallback.java | 1 -
java/org/apache/catalina/tribes/group/RpcChannel.java | 2 --
.../group/interceptors/DomainFilterInterceptor.java | 7 +--
.../group/interceptors/FragmentationInterceptor.java| 1 -
.../tribes/group/interceptors/GzipInterceptor.java | 4
.../group/interceptors/NonBlockingCoordinator.java | 5 -
.../tribes/group/interceptors/OrderInterceptor.java | 3 ---
.../tribes/group/interceptors/TcpFailureDetector.java | 17 ++---
.../tribes/group/interceptors/TcpPingInterceptor.java | 1 -
.../catalina/tribes/io/DirectByteArrayOutputStream.java | 2 --
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 4
.../apache/catalina/tribes/transport/RxTaskPool.java| 1 -
.../apache/catalina/tribes/transport/nio/NioSender.java | 2 --
java/org/apache/catalina/tribes/util/Arrays.java| 3 ---
java/org/apache/catalina/tribes/util/Logs.java | 2 --
java/org/apache/catalina/tribes/util/UUIDGenerator.java | 3 +--
.../org/apache/tomcat/jdbc/pool/ConnectionPool.java | 1 -
.../java/org/apache/tomcat/jdbc/pool/DataSource.java| 1 -
.../org/apache/tomcat/jdbc/pool/DataSourceProxy.java| 2 --
.../org/apache/tomcat/jdbc/pool/JdbcInterceptor.java| 2 --
.../org/apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../interceptor/AbstractCreateStatementInterceptor.java | 1 -
.../tomcat/jdbc/pool/interceptor/SlowQueryReport.java | 1 -
.../org/apache/tomcat/jdbc/test/DefaultProperties.java | 3 ---
.../org/apache/tomcat/jdbc/test/DefaultTestCase.java| 4
.../apache/catalina/tribes/demos/ChannelCreator.java| 11 ---
test/org/apache/catalina/tribes/demos/MapDemo.java | 3 +--
.../tribes/group/TestGroupChannelStartStop.java | 3 ---
46 files changed, 23 insertions(+), 139 deletions(-)
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index f3bc5b2a6a..1eb12975c6 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -38,9 +38,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-/**
- * @version 1.0
- */
public class ReplicatedContext extends StandardContext implements MapOwner {
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
private static final Log log = LogFactory.getLog(ReplicatedContext.class);
diff --git a/java/org/apache/catalina/ha/deploy/FileMessage.java
b/java/org/apache/catalina/ha/deploy/FileMessage.java
index 22d665cc31..1f359f8c6c 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessage.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessage.java
@@ -21,8 +21,7 @@ import org.apache.catalina.tribes.Member;
/**
* Contains the data for a file being transferred over TCP, this is
- * essentially a fragment of a file, read and written by the FileMessageFactory
- * @version 1.0
+ * essentially a fragment of a file, read and written by the
FileMessageFactory.
*/
public class FileMessage
[tomcat] branch 9.0.x updated: Remove confusing @version tags from Javadoc
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0fe6e2cee4 Remove confusing @version tags from Javadoc
0fe6e2cee4 is described below
commit 0fe6e2cee404d94ebfcb82f8691ae87403020191
Author: Mark Thomas
AuthorDate: Fri Oct 7 17:49:35 2022 +0100
Remove confusing @version tags from Javadoc
Also includes small amounts of Javadoc clean-up.
---
.../apache/catalina/ha/context/ReplicatedContext.java | 3 ---
java/org/apache/catalina/ha/deploy/FileMessage.java | 3 +--
.../apache/catalina/ha/deploy/FileMessageFactory.java | 2 --
java/org/apache/catalina/ha/deploy/WarWatcher.java | 1 -
java/org/apache/catalina/ha/session/BackupManager.java | 3 ---
java/org/apache/catalina/ha/session/DeltaRequest.java | 1 -
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/catalina/tribes/ChannelException.java | 6 ++
java/org/apache/catalina/tribes/ChannelListener.java| 10 +++---
java/org/apache/catalina/tribes/ErrorHandler.java | 3 ---
java/org/apache/catalina/tribes/Heartbeat.java | 2 +-
java/org/apache/catalina/tribes/MessageListener.java| 9 ++---
.../apache/catalina/tribes/RemoteProcessException.java | 8 +++-
java/org/apache/catalina/tribes/UniqueId.java | 6 +-
.../org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 --
java/org/apache/catalina/tribes/group/GroupChannel.java | 7 +--
.../catalina/tribes/group/InterceptorPayload.java | 3 ---
java/org/apache/catalina/tribes/group/Response.java | 1 -
java/org/apache/catalina/tribes/group/RpcCallback.java | 1 -
java/org/apache/catalina/tribes/group/RpcChannel.java | 2 --
.../group/interceptors/DomainFilterInterceptor.java | 7 +--
.../group/interceptors/FragmentationInterceptor.java| 1 -
.../tribes/group/interceptors/GzipInterceptor.java | 4
.../group/interceptors/NonBlockingCoordinator.java | 5 -
.../tribes/group/interceptors/OrderInterceptor.java | 3 ---
.../tribes/group/interceptors/TcpFailureDetector.java | 17 ++---
.../tribes/group/interceptors/TcpPingInterceptor.java | 1 -
.../catalina/tribes/io/DirectByteArrayOutputStream.java | 2 --
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 4
.../apache/catalina/tribes/transport/RxTaskPool.java| 1 -
.../apache/catalina/tribes/transport/nio/NioSender.java | 2 --
java/org/apache/catalina/tribes/util/Arrays.java| 3 ---
java/org/apache/catalina/tribes/util/Logs.java | 2 --
java/org/apache/catalina/tribes/util/UUIDGenerator.java | 3 +--
.../org/apache/tomcat/jdbc/pool/ConnectionPool.java | 1 -
.../java/org/apache/tomcat/jdbc/pool/DataSource.java| 1 -
.../org/apache/tomcat/jdbc/pool/DataSourceProxy.java| 2 --
.../org/apache/tomcat/jdbc/pool/JdbcInterceptor.java| 2 --
.../org/apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../interceptor/AbstractCreateStatementInterceptor.java | 1 -
.../tomcat/jdbc/pool/interceptor/SlowQueryReport.java | 1 -
.../org/apache/tomcat/jdbc/test/DefaultProperties.java | 3 ---
.../org/apache/tomcat/jdbc/test/DefaultTestCase.java| 4
.../apache/catalina/tribes/demos/ChannelCreator.java| 11 ---
test/org/apache/catalina/tribes/demos/MapDemo.java | 3 +--
.../tribes/group/TestGroupChannelStartStop.java | 3 ---
46 files changed, 23 insertions(+), 139 deletions(-)
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index f3bc5b2a6a..1eb12975c6 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -38,9 +38,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-/**
- * @version 1.0
- */
public class ReplicatedContext extends StandardContext implements MapOwner {
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
private static final Log log = LogFactory.getLog(ReplicatedContext.class);
diff --git a/java/org/apache/catalina/ha/deploy/FileMessage.java
b/java/org/apache/catalina/ha/deploy/FileMessage.java
index 22d665cc31..1f359f8c6c 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessage.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessage.java
@@ -21,8 +21,7 @@ import org.apache.catalina.tribes.Member;
/**
* Contains the data for a file being transferred over TCP, this is
- * essentially a fragment of a file, read and written by the FileMessageFactory
- * @version 1.0
+ * essentially a fragment of a file, read and written by the
FileMessageFactory.
*/
public class FileMessage
[tomcat] branch 10.0.x updated: Remove confusing @version tags from Javadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 97b8b1de9c Remove confusing @version tags from Javadoc
97b8b1de9c is described below
commit 97b8b1de9ce6de19360f2393b7a43360b643c421
Author: Mark Thomas
AuthorDate: Fri Oct 7 17:49:35 2022 +0100
Remove confusing @version tags from Javadoc
Also includes small amounts of Javadoc clean-up.
---
.../apache/catalina/ha/context/ReplicatedContext.java | 3 ---
java/org/apache/catalina/ha/deploy/FileMessage.java | 3 +--
.../apache/catalina/ha/deploy/FileMessageFactory.java | 2 --
java/org/apache/catalina/ha/deploy/WarWatcher.java | 1 -
java/org/apache/catalina/ha/session/BackupManager.java | 3 ---
java/org/apache/catalina/ha/session/DeltaRequest.java | 1 -
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/catalina/tribes/ChannelException.java | 6 ++
java/org/apache/catalina/tribes/ChannelListener.java| 10 +++---
java/org/apache/catalina/tribes/ErrorHandler.java | 3 ---
java/org/apache/catalina/tribes/Heartbeat.java | 2 +-
java/org/apache/catalina/tribes/MessageListener.java| 9 ++---
.../apache/catalina/tribes/RemoteProcessException.java | 8 +++-
java/org/apache/catalina/tribes/UniqueId.java | 6 +-
.../org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 --
java/org/apache/catalina/tribes/group/GroupChannel.java | 7 +--
.../catalina/tribes/group/InterceptorPayload.java | 3 ---
java/org/apache/catalina/tribes/group/Response.java | 1 -
java/org/apache/catalina/tribes/group/RpcCallback.java | 1 -
java/org/apache/catalina/tribes/group/RpcChannel.java | 2 --
.../group/interceptors/DomainFilterInterceptor.java | 7 +--
.../group/interceptors/FragmentationInterceptor.java| 1 -
.../tribes/group/interceptors/GzipInterceptor.java | 4
.../group/interceptors/NonBlockingCoordinator.java | 5 -
.../tribes/group/interceptors/OrderInterceptor.java | 3 ---
.../tribes/group/interceptors/TcpFailureDetector.java | 17 ++---
.../tribes/group/interceptors/TcpPingInterceptor.java | 1 -
.../catalina/tribes/io/DirectByteArrayOutputStream.java | 2 --
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 4
.../apache/catalina/tribes/transport/RxTaskPool.java| 1 -
.../apache/catalina/tribes/transport/nio/NioSender.java | 2 --
java/org/apache/catalina/tribes/util/Arrays.java| 3 ---
java/org/apache/catalina/tribes/util/Logs.java | 2 --
java/org/apache/catalina/tribes/util/UUIDGenerator.java | 3 +--
.../org/apache/tomcat/jdbc/pool/ConnectionPool.java | 1 -
.../java/org/apache/tomcat/jdbc/pool/DataSource.java| 1 -
.../org/apache/tomcat/jdbc/pool/DataSourceProxy.java| 2 --
.../org/apache/tomcat/jdbc/pool/JdbcInterceptor.java| 2 --
.../org/apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../interceptor/AbstractCreateStatementInterceptor.java | 1 -
.../tomcat/jdbc/pool/interceptor/SlowQueryReport.java | 1 -
.../org/apache/tomcat/jdbc/test/DefaultProperties.java | 3 ---
.../org/apache/tomcat/jdbc/test/DefaultTestCase.java| 4
.../apache/catalina/tribes/demos/ChannelCreator.java| 11 ---
test/org/apache/catalina/tribes/demos/MapDemo.java | 3 +--
.../tribes/group/TestGroupChannelStartStop.java | 3 ---
46 files changed, 23 insertions(+), 139 deletions(-)
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index dc45707f53..91c311708a 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -38,9 +38,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-/**
- * @version 1.0
- */
public class ReplicatedContext extends StandardContext implements MapOwner {
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
private static final Log log = LogFactory.getLog(ReplicatedContext.class);
diff --git a/java/org/apache/catalina/ha/deploy/FileMessage.java
b/java/org/apache/catalina/ha/deploy/FileMessage.java
index 22d665cc31..1f359f8c6c 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessage.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessage.java
@@ -21,8 +21,7 @@ import org.apache.catalina.tribes.Member;
/**
* Contains the data for a file being transferred over TCP, this is
- * essentially a fragment of a file, read and written by the FileMessageFactory
- * @version 1.0
+ * essentially a fragment of a file, read and written by the
FileMessageFactory.
*/
public class FileMessage
[tomcat] branch main updated: Remove confusing @version tags from Javadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3ff931720d Remove confusing @version tags from Javadoc
3ff931720d is described below
commit 3ff931720df23c0797413713de2f1cf79022f623
Author: Mark Thomas
AuthorDate: Fri Oct 7 17:49:35 2022 +0100
Remove confusing @version tags from Javadoc
Also includes small amounts of Javadoc clean-up.
---
.../apache/catalina/ha/context/ReplicatedContext.java | 3 ---
java/org/apache/catalina/ha/deploy/FileMessage.java | 3 +--
.../apache/catalina/ha/deploy/FileMessageFactory.java | 2 --
java/org/apache/catalina/ha/deploy/WarWatcher.java | 1 -
java/org/apache/catalina/ha/session/BackupManager.java | 3 ---
java/org/apache/catalina/ha/session/DeltaRequest.java | 1 -
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/catalina/tribes/ChannelException.java | 6 ++
java/org/apache/catalina/tribes/ChannelListener.java| 10 +++---
java/org/apache/catalina/tribes/ErrorHandler.java | 3 ---
java/org/apache/catalina/tribes/Heartbeat.java | 2 +-
java/org/apache/catalina/tribes/MessageListener.java| 9 ++---
.../apache/catalina/tribes/RemoteProcessException.java | 8 +++-
java/org/apache/catalina/tribes/UniqueId.java | 6 +-
.../org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 --
java/org/apache/catalina/tribes/group/GroupChannel.java | 7 +--
.../catalina/tribes/group/InterceptorPayload.java | 3 ---
java/org/apache/catalina/tribes/group/Response.java | 1 -
java/org/apache/catalina/tribes/group/RpcCallback.java | 1 -
java/org/apache/catalina/tribes/group/RpcChannel.java | 2 --
.../group/interceptors/DomainFilterInterceptor.java | 7 +--
.../group/interceptors/FragmentationInterceptor.java| 1 -
.../tribes/group/interceptors/GzipInterceptor.java | 4
.../group/interceptors/NonBlockingCoordinator.java | 5 -
.../tribes/group/interceptors/OrderInterceptor.java | 3 ---
.../tribes/group/interceptors/TcpFailureDetector.java | 17 ++---
.../tribes/group/interceptors/TcpPingInterceptor.java | 1 -
.../catalina/tribes/io/DirectByteArrayOutputStream.java | 2 --
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 4
.../apache/catalina/tribes/transport/RxTaskPool.java| 1 -
.../apache/catalina/tribes/transport/nio/NioSender.java | 2 --
java/org/apache/catalina/tribes/util/Arrays.java| 3 ---
java/org/apache/catalina/tribes/util/Logs.java | 2 --
java/org/apache/catalina/tribes/util/UUIDGenerator.java | 3 +--
.../org/apache/tomcat/jdbc/pool/ConnectionPool.java | 1 -
.../java/org/apache/tomcat/jdbc/pool/DataSource.java| 1 -
.../org/apache/tomcat/jdbc/pool/DataSourceProxy.java| 2 --
.../org/apache/tomcat/jdbc/pool/JdbcInterceptor.java| 2 --
.../org/apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../interceptor/AbstractCreateStatementInterceptor.java | 1 -
.../tomcat/jdbc/pool/interceptor/SlowQueryReport.java | 1 -
.../org/apache/tomcat/jdbc/test/DefaultProperties.java | 3 ---
.../org/apache/tomcat/jdbc/test/DefaultTestCase.java| 4
.../apache/catalina/tribes/demos/ChannelCreator.java| 11 ---
test/org/apache/catalina/tribes/demos/MapDemo.java | 3 +--
.../tribes/group/TestGroupChannelStartStop.java | 3 ---
46 files changed, 23 insertions(+), 139 deletions(-)
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index dc45707f53..91c311708a 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -38,9 +38,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-/**
- * @version 1.0
- */
public class ReplicatedContext extends StandardContext implements MapOwner {
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
private static final Log log = LogFactory.getLog(ReplicatedContext.class);
diff --git a/java/org/apache/catalina/ha/deploy/FileMessage.java
b/java/org/apache/catalina/ha/deploy/FileMessage.java
index 22d665cc31..1f359f8c6c 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessage.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessage.java
@@ -21,8 +21,7 @@ import org.apache.catalina.tribes.Member;
/**
* Contains the data for a file being transferred over TCP, this is
- * essentially a fragment of a file, read and written by the FileMessageFactory
- * @version 1.0
+ * essentially a fragment of a file, read and written by the
FileMessageFactory.
*/
public class FileMessage extends
Re: [VOTE] Release Apache Tomcat 10.0.27
> 2022年10月4日 00:13，Mark Thomas 写道： > > The proposed Apache Tomcat 10.0.27 release is now available for > voting. > > Apache Tomcat 10.0.27 is likely to be the last release of the 10.0.x series. > Users of 10.0.x should plan to move to 10.1.x at the next update. > > Apache Tomcat 10.0.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to jakarta.* > > Applications that run on Tomcat 9 will not run on Tomcat 10 without changes. > Java EE applications designed for Tomcat 9 and earlier may be placed in the > $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert > them to Jakarta EE and copy them to the webapps directory > > The notable changes compared to 10.0.27 are: > > - Fix bug 66277, a refactoring regression that broke JSP includes > amongst other functionality > > - Fix unexpected timeouts that may appear as client disconnections when > using HTTP/2 and NIO2 > > - Enforce the requirement of RFC 7230 onwards that a request with a > malformed content-length header should always be rejected with a 400 > response. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.27/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1400 > > The tag is: > https://github.com/apache/tomcat/tree/10.0.27 > ca8720d41f3be917dc3fcdd03fcca8d3152a13fb > > The proposed 10.0.27 release is: > [ ] Broken - do not release > [ X] Stable - go ahead and release as 10.0.27 (stable) Han > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 9.0.68 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 9.0.68. Apache Tomcat 9 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and JASPIC technologies. Apache Tomcat 9.0.68 is a bugfix and feature release. The notable changes compared to 9.0.67 include: - Fix bug 66277, a refactoring regression that broke JSP includes amongst other functionality - Fix unexpected timeouts that may appear as client disconnections when using HTTP/2 and NIO2 - Enforce the requirement of RFC 7230 onwards that a request with a malformed content-length header should always be rejected with a 400 response. Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html Downloads: https://tomcat.apache.org/download-90.cgi Migration guides from Apache Tomcat 7.x and 8.x: https://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r57205 - /release/tomcat/tomcat-9/v9.0.67/
Author: markt Date: Fri Oct 7 09:49:27 2022 New Revision: 57205 Log: Remove 9.0.67 from CDN Removed: release/tomcat/tomcat-9/v9.0.67/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1904439 - in /tomcat/site/trunk: docs/ xdocs/
Author: markt Date: Fri Oct 7 09:46:25 2022 New Revision: 1904439 URL: http://svn.apache.org/viewvc?rev=1904439=rev Log: Update site for 9.0.68 release Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-90.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1904439=1904438=1904439=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Oct 7 09:46:25 2022 @@ -74,8 +74,8 @@ Latest Stable 9.0.x Release -2022-09-26 -9.0.67 +2022-10-07 +9.0.68 Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1904439=1904438=1904439=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Fri Oct 7 09:46:25 2022 @@ -10,7 +10,7 @@ Quick Navigation -[define v]9.0.67[end] +[define v]9.0.68[end] https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1904439=1904438=1904439=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Fri Oct 7 09:46:25 2022 @@ -34,6 +34,28 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2022-10-07 Tomcat 9.0.68 Released + +The Apache Tomcat Project is proud to announce the release of version 9.0.68 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 8 platform. The notable changes compared to 9.0.67 include: + +Fix bug https://bz.apache.org/bugzilla/show_bug.cgi?id=66277;>66277, a refactoring regression that broke JSP includes +amongst other functionality +Fix unexpected timeouts that may appear as client disconnections when using +HTTP/2 and NIO2 +Enforce the requirement of RFC 7230 onwards that a request with a malformed +content-length header should always be rejected with a 400 response. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 9 +changelog. + + + +https://tomcat.apache.org/download-90.cgi;>Download + 2022-09-26 Tomcat 10.1.0 Released The Apache Tomcat Project is proud to announce the release of version 10.1.0 @@ -95,28 +117,6 @@ changelog. https://tomcat.apache.org/download-10.cgi;>Download -2022-09-26 Tomcat 9.0.67 Released - -The Apache Tomcat Project is proud to announce the release of version 9.0.67 -of Apache Tomcat. This release implements specifications that are part of the -Java EE 8 platform. The notable changes compared to 9.0.65 include: - -Add support for authenticating WebSocket clients with an HTTP forward -proxy when establishing a connection to a WebSocket endpoint via a -forward proxy that requires authentication. Based on a patch provided -by Joe Mokos. -Various fixes for edge case bugs in EL processing. -Improve host header handling for HTTP/2 requests. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 9 -changelog. - - - -https://tomcat.apache.org/download-90.cgi;>Download - 2022-09-20 Tomcat Migration Tool for Jakarta EE 1.0.4 Released The Apache Tomcat Project is proud to announce the release of 1.0.4 of the Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1904439=1904438=1904439=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Fri Oct 7 09:46:25 2022 @@ -447,7 +447,9 @@ of Apache Tomcat. 9.0.62 9.0.63 9.0.64 -9.0.65 +9.0.65 +9.0.67 +9.0.68 , new version: 9.0.0-M1 @@ -518,7 +520,8 @@ of Apache Tomcat. 9.0.63 9.0.64 9.0.65 -9.0.67 +9.0.67 +9.0.68 trunk (unreleased) Modified: tomcat/site/trunk/docs/oldnews.html URL:
svn commit: r1904438 - in /tomcat/site/trunk: ./ docs/tomcat-9.0-doc/ docs/tomcat-9.0-doc/annotationapi/ docs/tomcat-9.0-doc/annotationapi/javax/annotation/ docs/tomcat-9.0-doc/annotationapi/javax/ann
Author: markt Date: Fri Oct 7 09:40:26 2022 New Revision: 1904438 URL: http://svn.apache.org/viewvc?rev=1904438=rev Log: Update docs for 9.0.68 release [This commit notification would consist of 68 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[DISCUSS] EOL date for 8.5.x
Hi all, I don't think there is a need to make a decision on this quickly, but based on past experience and the current discussions about Jakarta EE 11 I think this is something we need to start thinking about. Some key facts: - Tomcat 7.0.x reached EOL on 31 March 2021 - EOL dates for major versions tend to be 3-4 years apart - We aim to support 3 major versions in parallel - currently 8.5.x, 9.0.x and 10.1.x. - Tomcat 11 will implement Jakarta EE 11 - Current Jakarta EE discussions are around a release in ~1 year - Ideally, Tomcat 8.5.x EOL would be just after Tomcat 11 is declared stable Based on the above I think EOL for 8.5.x should be either 31 March 2024 or 30 Sept 2024 depending on when we think Jakarta EE 11 will be released. Jakarta EE releases have tendency to slip so I think the 30 Sept 2024 is probably the more likely. However, it is much easier to delay an EOL date than to bring to bring it forward so my current thinking is to announce 31 March 2024 as the EOL date for 8.5.x and keep in mind that we can extend that if we want to. Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date for 9.0.68
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 The following commit(s) were added to refs/heads/9.0.x by this push: new cf97812074 Add release date for 9.0.68 cf97812074 is described below commit cf978120743b3eaa8f154005bb23d91d8e72a3ee Author: Mark Thomas AuthorDate: Fri Oct 7 09:59:16 2022 +0100 Add release date for 9.0.68 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d521ab11b3..f7d53cee7c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -106,7 +106,7 @@ --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r57203 - /dev/tomcat/tomcat-9/v9.0.68/ /release/tomcat/tomcat-9/v9.0.68/
Author: markt Date: Fri Oct 7 08:37:14 2022 New Revision: 57203 Log: Release Apache Tomcat 9.0.68 Added: release/tomcat/tomcat-9/v9.0.68/ - copied from r57202, dev/tomcat/tomcat-9/v9.0.68/ Removed: dev/tomcat/tomcat-9/v9.0.68/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE][RESULT] Release Apache Tomcat 9.0.68
The following votes were cast: Binding: +1: markt, remm, ebourg No other votes were cast. This vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
