From f1d1f5635a6d452b261c1c29e5c0e43a0320125b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 16:46:02 +0000
Subject: Added ShutdownHandler to BKULocal.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@727 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java  | 8 +++++++-
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml           | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'BKULocal/src')

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());
diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index f85479cb..62590257 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -191,5 +191,10 @@
 			</map>
 		</property>
 	</bean>
+	
+  <!-- Shutdown Event handler -->
+  <bean id="shutdownHandler" class="at.gv.egiz.bku.spring.ShutdownHandler">
+    <property name="bindingProcessorManager" ref="bindingProcessorManager" />
+  </bean>
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3