Fixed Bug#405 and added according test case

Fixed Bug#402
Added Feature#403

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

1 files changed, 15 insertions, 8 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
index a4d3e5d1..e9d9a38a 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
@@ -79,7 +79,21 @@ public class ResultServlet extends SpringBKUServlet {
   }
 
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, java.io.IOException {
+      throws ServletException, java.io.IOException { 
+    String version = configurator.getProperty(Configurator.SIGNATURE_LAYOUT);
+    if ((version != null) && (!"".equals(version.trim()))) {
+      resp.setHeader(Configurator.SIGNATURE_LAYOUT, version);
+    } else {
+      log.debug("Do not set siglayout header");
+    }
+      
+    if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) {
+      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER, configurator
+          .getProperty(Configurator.USERAGENT_CONFIG_P));
+    } else {
+      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER,
+              Configurator.USERAGENT_DEFAULT);
+    }
 
     HttpSession session = req.getSession(false);
     if (session == null) {
@@ -119,13 +133,6 @@ public class ResultServlet extends SpringBKUServlet {
     resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1
     resp.setHeader("Pragma", "no-cache"); // HTTP 1.0
     resp.setDateHeader("Expires", 0);
-    if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) {
-      resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT, configurator
-          .getProperty(Configurator.USERAGENT_CONFIG_P));
-    } else {
-      resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT,
-              Configurator.USERAGENT_DEFAULT);
-    }
     for (Iterator<String> it = bp.getResponseHeaders().keySet().iterator(); it
         .hasNext();) {
       String header = it.next();