1 files changed, 14 insertions, 19 deletions

diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/util/CitizenCardServletUtils.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/util/CitizenCardServletUtils.java
index 9fbdf5cd7..1f2cda680 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/util/CitizenCardServletUtils.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/util/CitizenCardServletUtils.java
@@ -50,7 +50,6 @@
 package at.gv.egovernment.moa.id.util;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URLEncoder;
 
 import javax.servlet.http.HttpServletResponse;
@@ -93,12 +92,11 @@ public class CitizenCardServletUtils extends ServletUtils{
       resp.addHeader("Location", dataURL);
       
       //TODO test impact of explicit setting charset with older versions of BKUs (HotSign)
-      resp.setContentType(MediaType.XML_UTF_8.toString());
       
-      OutputStream out = resp.getOutputStream();
-      out.write(createXMLSignatureRequestOrRedirect.getBytes("UTF-8"));
-      out.flush();
-      out.close();
+      byte[] content = createXMLSignatureRequestOrRedirect.getBytes("UTF-8");
+      resp.setContentType(MediaType.XML_UTF_8.toString());
+      resp.setContentLength(content.length);
+      resp.getOutputStream().write(content);
       Logger.debug("Finished POST " + servletName);
       
     } else {
@@ -129,12 +127,11 @@ public class CitizenCardServletUtils extends ServletUtils{
       resp.addHeader("Location", dataURL);
       
       //TODO test impact of explicit setting charset with older versions of BKUs (HotSign)
+      
+      byte[] content = createXMLSignatureRequestOrRedirect.getBytes("UTF-8");
       resp.setContentType(MediaType.XML_UTF_8.toString());
-            
-      OutputStream out = resp.getOutputStream();
-      out.write(createXMLSignatureRequestOrRedirect.getBytes("UTF-8"));
-      out.flush();
-      out.close();
+      resp.setContentLength(content.length);
+      resp.getOutputStream().write(content);
       Logger.debug("Finished POST " + servletName);
     
   }
@@ -156,16 +153,14 @@ public class CitizenCardServletUtils extends ServletUtils{
          IOException { 
 	  resp.setStatus(200);
 	  Logger.debug("ContentType set to: application/x-www-form-urlencoded");
-	
-	  resp.setContentType("application/x-www-form-urlencoded");
-	  
-	  String content = "XMLRequest=" + URLEncoder.encode(createXMLSignatureRequestOrRedirect, "UTF-8") + "&" + 
+		  	  
+	  String respString = "XMLRequest=" + URLEncoder.encode(createXMLSignatureRequestOrRedirect, "UTF-8") + "&" + 
 	  					"DataURL=" + URLEncoder.encode(dataURL, "UTF-8");
       
-      OutputStream out = resp.getOutputStream();
-      out.write(content.getBytes("UTF-8"));
-      out.flush();
-      out.close();
+      byte[] content = respString.getBytes("UTF-8");
+      resp.setContentType("application/x-www-form-urlencoded");
+      resp.setContentLength(content.length);
+      resp.getOutputStream().write(content);	  
       Logger.debug("Finished POST " + servletName);
     
   }