Issue #4903 - catch Throwable instead of RuntimeException

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · May 26, 2020 · 5c63b0e · 5c63b0e
1 parent c41560c
commit 5c63b0e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/...-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
@@ -224,9 +224,11 @@ else if (Endpoint.class.isAssignableFrom(endpoint))
 
             return metadata;
         }
-        catch (RuntimeException e)
+        catch (Throwable t)
         {
-            throw new DeploymentException(e.getMessage(), e);
+            if (t instanceof DeploymentException)
+                throw t;
+            throw new DeploymentException(t.getMessage(), t);
         }
     }