Remove unused code

Following 1c35c6d the session to client map is no longer used. Remove it. Patch submitted by Brian Matzon.
apache · Jan 17, 2025 · 908fba1 · 908fba1
1 parent 3291f64
commit 908fba1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -46,7 +46,6 @@ public class CrawlerSessionManagerValve extends ValveBase {
     private static final Log log = LogFactory.getLog(CrawlerSessionManagerValve.class);
 
     private final Map<String,String> clientIdSessionId = new ConcurrentHashMap<>();
-    private final Map<String,String> sessionIdClientId = new ConcurrentHashMap<>();
 
     private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo! Slurp.*|.*Feedfetcher-Google.*";
     private Pattern uaPattern = null;
@@ -246,7 +245,6 @@ public void invoke(Request request, Response response) throws IOException, Servl
                 HttpSession s = request.getSession(false);
                 if (s != null) {
                     clientIdSessionId.put(clientIdentifier, s.getId());
-                    sessionIdClientId.put(s.getId(), clientIdentifier);
                     // #valueUnbound() will be called on session expiration
                     s.setAttribute(this.getClass().getName(),
                             new CrawlerHttpSessionBindingListener(clientIdSessionId, clientIdentifier));

diff --git a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
@@ -165,7 +165,7 @@ private void verifyCrawlingContext(CrawlerSessionManagerValve valve, String cont
     private HttpSession createSessionExpectations(CrawlerSessionManagerValve valve, boolean isBot) {
         HttpSession session = EasyMock.createMock(HttpSession.class);
         if (isBot) {
-            EasyMock.expect(session.getId()).andReturn("id").times(2);
+            EasyMock.expect(session.getId()).andReturn("id").times(1);
             session.setAttribute(EasyMock.eq(valve.getClass().getName()),
                     EasyMock.anyObject(HttpSessionBindingListener.class));
             EasyMock.expectLastCall();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -140,6 +140,11 @@
         Improve checks for <code>WEB-INF</code> and <code>META-INF</code> in
         the WebDAV servlet. Based on a patch submitted by Chenjp. (remm)
       </fix>
+      <fix>
+        Remove unused session to client map from
+        <code>CrawlerSessionManagerValve</code>. Submitted by Brian Matzon.
+        (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">