1 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
index 2adc4b1..16352de 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
@@ -126,6 +126,7 @@ public class DataURLServlet extends HttpServlet
     {
       Object sessionObject = SessionHelper.getSession(request);
 
+      // obsolete since EncodingFilter is set in web.xml
       checkRequestCharacterEncoding(request);
       
       if (sessionObject instanceof SignSessionInformation)
@@ -152,8 +153,6 @@ public class DataURLServlet extends HttpServlet
   
   protected void checkRequestCharacterEncoding(HttpServletRequest request) throws UnsupportedEncodingException
   {
-    log.debug("Request character encoding = " + request.getCharacterEncoding()); //$NON-NLS-1$
-//  if (request.getCharacterEncoding() == null || request.getCharacterEncoding().equals("UTF-8")) //$NON-NLS-1$
   if (request.getCharacterEncoding() == null || request.getCharacterEncoding().length() <= 0) //$NON-NLS-1$
   {
     log.info("The BKU didn't set a character encoding for the request."); //$NON-NLS-1$
@@ -220,12 +219,20 @@ public class DataURLServlet extends HttpServlet
       response.setCharacterEncoding("UTF-8");
       response.getWriter().println(request_string);
     }
-    else
+    else if (xml_response != null)
     {
       log.debug("Received a normal response -> storing the response."); //$NON-NLS-1$
 
       Properties response_properties = new Properties();
       response_properties.setProperty(BKUPostConnection.RESPONSE_STRING_KEY, xml_response);
+      
+      String userAgent = request.getHeader("User-Agent");
+      if (userAgent != null) {
+         response_properties.setProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY, userAgent);
+      } else {
+         log.warn("BKU request/response header \"User-Agent\" is empty.");
+      }
+      
       si.response_properties = response_properties;
       
       log.debug("All requests have been processed -> processing the responses."); //$NON-NLS-1$
@@ -294,7 +301,9 @@ public class DataURLServlet extends HttpServlet
          
          // do not insert any code within this else block !
       }
-    }
+    } else {
+        log.debug("No XMLResponse found. Do nothing.");
+     }
   }
   
   protected void processVerify(HttpServletRequest request, HttpServletResponse response, VerifySessionInformation si) throws ServletException, IOException, ConnectorException, InvalidIDException