MYFACES-4696: 5.0 Undertow connection abort handling (#814)

apache · Dec 18, 2024 · f226c67 · f226c67
1 parent 3251378
commit f226c67
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -612,7 +612,7 @@ libraryName, isAllowSlashesLibraryName()))
                 }
             }
         }
-        catch (IOException e)
+        catch (Exception e)
         {
             if (isConnectionAbort(e))
             {
@@ -635,10 +635,12 @@ libraryName, isAllowSlashesLibraryName()))
         }
     }
 
-    private static boolean isConnectionAbort(IOException e)
+    private static boolean isConnectionAbort(Exception e)
     {
-        return e.getClass().getCanonicalName().equals("org.apache.catalina.connector.ClientAbortException")
-                || e.getClass().getCanonicalName().equals("org.eclipse.jetty.io.EofException");
+        String exceptionName = e.getClass().getCanonicalName();
+        return "org.apache.catalina.connector.ClientAbortException".equals(exceptionName) // Tomcat
+                || "org.eclipse.jetty.io.EofException".equals(exceptionName) // Jetty
+                || (e instanceof IllegalStateException && e.getMessage().contains("UT000127")); // Undertow
     }
 
     /**