1 files changed, 7 insertions, 1 deletions
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
index cd81b592..7c6e165f 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
@@ -104,7 +104,6 @@ public class BKURequestHandler extends SpringBKUServlet {
         if (redirectURL != null) {
           // send redirect and return
           resp.sendRedirect(redirectURL);
-          return;
         }
         
         // wait for the binding processor to finish processing
@@ -117,6 +116,13 @@ public class BKURequestHandler extends SpringBKUServlet {
           log.error("Request processing failed.", e);
           resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
           return;
+        } finally {
+          bindingProcessorManager.removeBindingProcessor(id);
+        }
+        
+        if (redirectURL != null) {
+          // already redirected
+          return;
         }
         
 		resp.setStatus(bindingProcessor.getResponseCode());