From 95f6c6fe321d33dc8fa9e18c7d96bd9b21ef10cc Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Wed, 14 Jan 2009 11:39:31 +0000
Subject: Switching to itext-2.1.5-rev3628. itext library: minor adjustments
 for pdf-as Adding new error code (103) for invalid pdfa/1b font
 configuration. Minor updates for PDF/A support. Support for local MOCCA CCS
 added. Multi language for web application. Encoding issue for web application
 fixed by implementing an EncodingFilter. Dynamic sign upload form
 implemented. Order of input fields for dynamic upload form changed. MOCCA
 logo added to sign upload form.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@319 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../wag/egov/egiz/web/servlets/DataURLServlet.java      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java')

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
-- 
cgit v1.2.3