Remove unused code - Thanks to UCDetector

jgneff · Jun 17, 2022 · e3369f3 · e3369f3
1 parent 01763b4
commit e3369f3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 229 deletions.
diff --git a/MERGE.txt b/MERGE.txt
@@ -62,12 +62,14 @@ Note: Tomcat's copy of fileupload also includes classes copied manually from
 DBCP
 ----
 Pool2
+Unused classes removed
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
 rel/commons-pool-2.11.1 (2021-08-17)
 
 DBCP2
+No unused code removed
 Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2

diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java b/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
diff --git a/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java b/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java