From bf89cd34515445f4a38f67b87c134b9c20c4bbea Mon Sep 17 00:00:00 2001 From: jaewohong Date: Thu, 15 Jan 2026 15:17:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/client/impl/HttpClient5AdapterServiceRest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java index d2d2361..8cd4cf4 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java @@ -618,10 +618,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp jsonStr = KJB_ROOTLESS_ARRAY + jsonStr + "}"; responseMessage = jsonStr.getBytes(vo.getEncode()); } -<<<<<<< HEAD -======= ->>>>>>> branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/elink-online-common.git return assignResponseHeaders(method, responseMessage, headerGroupName, vo.getEncode(), messageType, relayResponseHeaderKeys, status, responseHeaderProp);