(tomcat) 01/02: Avoid throw - catch - re-throw for CNFE

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3ea629d11258f02203868b541a52c973c0090477
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 20 20:15:44 2024 +0000

    Avoid throw - catch - re-throw for CNFE
---
 java/org/apache/catalina/loader/WebappClassLoaderBase.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index dde900f9bb..e954562c17 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -702,18 +702,18 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
                     throw e;
                 }
             }
-            if (clazz == null) {
-                if (log.isTraceEnabled()) {
-                    log.trace("    --> Returning ClassNotFoundException");
-                }
-                throw new ClassNotFoundException(name);
-            }
         } catch (ClassNotFoundException e) {
             if (log.isTraceEnabled()) {
                 log.trace("    --> Passing on ClassNotFoundException");
             }
             throw e;
         }
+        if (clazz == null) {
+            if (log.isTraceEnabled()) {
+                log.trace("    --> Returning ClassNotFoundException");
+            }
+            throw new ClassNotFoundException(name);
+        }
 
         // Return the class we have located
         if (log.isTraceEnabled()) {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org