fixed wrong code location, added TODO for remove those safe code once on more old data

Xin Zheng · Xin Zheng · commit 2e3e7f4254a2 · 2026-03-31T08:43:51.000+07:00
diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/event/EventBusHandler.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/event/EventBusHandler.java
@@ -183,6 +183,8 @@ public boolean handle(final HttpServerRequest request) {
                                         } else if (responseContentType != null && responseContentType.contains(TEXT)) {
                                             rsp.end(response.getString(PAYLOAD));
                                         } else {
+                                            //TODO: remove decodeBase64Safe back to getBinary once we have no more old data in storage
+                                            //rsp.end(Buffer.buffer(response.getBinary(PAYLOAD)));
                                             rsp.end(Buffer.buffer(Base64Unit.decodeBase64Safe(response.getString(PAYLOAD))));
                                         }
                                     } catch (DecodeException e) {
diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/HttpRequest.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/HttpRequest.java
@@ -83,8 +83,10 @@ public HttpRequest(JsonObject object) {
         JsonArray headersArray = object.getJsonArray("headers");
         if (headersArray != null) {
             this.headers = JsonMultiMap.fromJson(headersArray);
-            this.payload = Base64Unit.decodeBase64Safe(object.getString("payload"));
         }
+        //TODO: remove decodeBase64Safe back to getBinary once we have no more old data in storage
+        //this.payload = object.getBinary("payload");
+        this.payload = Base64Unit.decodeBase64Safe(object.getString("payload"));
     }
 
     public JsonObject toJsonObject() {

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,8 @@ public boolean handle(final HttpServerRequest request) {`
`183`	`183`	`} else if (responseContentType != null && responseContentType.contains(TEXT)) {`
`184`	`184`	`rsp.end(response.getString(PAYLOAD));`
`185`	`185`	`} else {`
	`186`	`+ //TODO: remove decodeBase64Safe back to getBinary once we have no more old data in storage`
	`187`	`+ //rsp.end(Buffer.buffer(response.getBinary(PAYLOAD)));`
`186`	`188`	`rsp.end(Buffer.buffer(Base64Unit.decodeBase64Safe(response.getString(PAYLOAD))));`
`187`	`189`	`}`
`188`	`190`	`} catch (DecodeException e) {`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,10 @@ public HttpRequest(JsonObject object) {`
`83`	`83`	`JsonArray headersArray = object.getJsonArray("headers");`
`84`	`84`	`if (headersArray != null) {`
`85`	`85`	`this.headers = JsonMultiMap.fromJson(headersArray);`
`86`		`- this.payload = Base64Unit.decodeBase64Safe(object.getString("payload"));`
`87`	`86`	`}`
	`87`	`+ //TODO: remove decodeBase64Safe back to getBinary once we have no more old data in storage`
	`88`	`+ //this.payload = object.getBinary("payload");`
	`89`	`+ this.payload = Base64Unit.decodeBase64Safe(object.getString("payload"));`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`public JsonObject toJsonObject() {`