commit c3c11d4a9d4254b13e3fd4e6945533b995e7b930
author Frank Dietrich <simon.reis@pta.de> Mon Mar 26 13:19:22 2018 +0200
committer Frank Dietrich <simon.reis@pta.de> Mon Mar 26 13:19:22 2018 +0200
tree 2a01eb078febbd69c88d6a84972abcfd5b7d013f
parent d88a13050b4f93aff56c0960863d9ef1738f0301
parent 69c82e3a8e23d8acb8484a808939507b5e06b444

Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/Dropwizard/Microservices/mics-central-service into DEVELOP_BE

src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java

diff --git a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
index b9efc98..76a9e2a 100644
--- a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
+++ b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
@@ -13,9 +13,14 @@
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.log4j.Logger;
 import org.glassfish.jersey.internal.util.Base64;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 public class ServiceRequestEnvelope {
+    private static final Logger logger = Logger.getLogger(ServiceRequestEnvelope.class);
     public static class HttpHeader {
         private String attribute;
         private String value;
@@ -106,7 +111,12 @@
 
     public String getPayloadDecode() {
         if( payload != null && !payload.isEmpty()) {
-            return Base64.decodeAsString(payload);
+            try {
+                return URLDecoder.decode(Base64.decodeAsString(payload), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                logger.error("Unsupported Encoding", e);
+                return "";
+            }
         }
         else {
             return "";