Changed session handling strategy when reconnecting (eg. reload pressed)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@224 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

3 files changed, 7 insertions, 9 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index f31559cd..3aa6bc19 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -75,9 +75,11 @@ public class BKURequestHandler extends SpringBKUServlet {
     HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
-          + " active, deleting this one");
-      getBindingProcessorManager().removeBindingProcessor(
-          IdFactory.getInstance().createId(session.getId()));
+          + " active, continuing");
+      RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
+      log.debug("forward to applet");
+      dispatcher.forward(req, resp);
+      return;
     }
     session = req.getSession(true);
     if (log.isDebugEnabled()) {
diff --git a/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
new file mode 100644
index 00000000..669a1f92
--- /dev/null
+++ b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 04d8d0dd..55f51b22 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -24,8 +24,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,7 +34,6 @@ import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
-import java.util.Collections;
 
 public abstract class AbstractSMCCSTAL implements STAL {
   private static Log log = LogFactory.getLog(AbstractSMCCSTAL.class);
@@ -106,7 +103,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
           log.info("Interrupt in handleRequest, do not retry");
           throw e;
         } catch (Exception e) {
-          log.info("Error while handling STAL request:" + e);
+          log.info("Error while handling STAL request:", e);
           if (++retryCounter < maxRetries) {
             signatureCard.disconnect(true);
             signatureCard = null;
@@ -143,8 +140,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
         }
       } catch (InterruptedException ex) {
         log.error("got interrupted, return ErrorResponse 6001");
-        responseList = Collections.singletonList((STALResponse) new ErrorResponse(6001));
-        break;
+        throw new RuntimeException(ex);
       }
       
     }