[tomcat] branch main updated: Code clean-up - no functional change

[markt]

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 ffb39221e5 Code clean-up - no functional change
ffb39221e5 is described below

commit ffb39221e535a986523db742289e9de2afe93feb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 26 13:19:47 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 b8708b9c45..40c214fd87 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -83,7 +83,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
@@ -284,8 +284,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);
             }
@@ -1445,8 +1445,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org