수정
This commit is contained in:
-3
@@ -618,10 +618,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
|
|||||||
jsonStr = KJB_ROOTLESS_ARRAY + jsonStr + "}";
|
jsonStr = KJB_ROOTLESS_ARRAY + jsonStr + "}";
|
||||||
responseMessage = jsonStr.getBytes(vo.getEncode());
|
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,
|
return assignResponseHeaders(method, responseMessage, headerGroupName, vo.getEncode(), messageType,
|
||||||
relayResponseHeaderKeys, status, responseHeaderProp);
|
relayResponseHeaderKeys, status, responseHeaderProp);
|
||||||
|
|||||||
Reference in New Issue
Block a user