[wicket] 02/02: WICKET-6908 detach all handlers

[svenmeier]

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

svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 7c0009c8dffcaa625525a87c9b1a381127594787
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Mon Jul 26 22:03:05 2021 +0200

    WICKET-6908 detach all handlers
    
    even if one throws a RuntimeException
---
 .../apache/wicket/request/RequestHandlerExecutor.java    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
 
b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
index f60b27a..47df808 100644
--- 
a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
+++ 
b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerExecutor.java
@@ -132,21 +132,27 @@ public abstract class RequestHandlerExecutor
                        active = null;
                }
 
+               RuntimeException rethrow = null;;
                for (IRequestHandler handler : inactiveRequestHandlers)
                {
                        try
                        {
                                detach(handler);
                        }
-                       catch (RuntimeException exception)
-                       {
-                               throw exception;
-                       }
                        catch (Exception exception)
                        {
-                               log.error("Error detaching RequestHandler", 
exception);
+                               if (rethrow == null && exception instanceof 
RuntimeException) {
+                                       rethrow = (RuntimeException) exception;
+                               } else {
+                                       log.error("Error detaching 
RequestHandler", exception);
+                               }
                        }
                }
+               if (rethrow != null) {
+                       // WICKET-6001 runtime exceptions are rethrown
+                       // TODO obsolete should component-queueing be removed
+                       throw rethrow;
+               }
        }
 
        /**