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 2023/09/26 12:32:37 UTC
[tomcat] 01/02: Code clean-up - no functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ed48a6365ca2255fa658b7b0aa7b435f6d7b8fce
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 26 13:20:35 2023 +0100
Code clean-up - no functional change
---
java/org/apache/catalina/mapper/Mapper.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java b/java/org/apache/catalina/mapper/Mapper.java
index f73e7429b5..c3a4cff8dd 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -71,7 +71,7 @@ public final class Mapper {
/**
* Mapping from Context object to Context version to support RequestDispatcher mappings.
*/
- private final Map<Context, ContextVersion> contextObjectToContextVersionMap = new ConcurrentHashMap<>();
+ private final Map<Context,ContextVersion> contextObjectToContextVersionMap = new ConcurrentHashMap<>();
// --------------------------------------------------------- Public Methods
@@ -272,8 +272,8 @@ public final class Mapper {
}
int slashCount = slashCount(path);
synchronized (mappedHost) {
- ContextVersion newContextVersion = new ContextVersion(version, path, slashCount, context, resources,
- welcomeResources);
+ ContextVersion newContextVersion =
+ new ContextVersion(version, path, slashCount, context, resources, welcomeResources);
if (wrappers != null) {
addWrappers(newContextVersion, wrappers);
}
@@ -1427,8 +1427,7 @@ public final class Mapper {
/**
* Insert into the right place in a sorted MapElement array, and prevent duplicates.
*/
- private static <T> boolean insertMap(MapElement<T>[] oldMap, MapElement<T>[] newMap,
- MapElement<T> newElement) {
+ private static <T> boolean insertMap(MapElement<T>[] oldMap, MapElement<T>[] newMap, MapElement<T> newElement) {
int pos = find(oldMap, newElement.name);
if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org