diff --git a/src/main/java/com/eactive/eai/common/message/EAIMessage.java b/src/main/java/com/eactive/eai/common/message/EAIMessage.java index b8345e0..127621f 100644 --- a/src/main/java/com/eactive/eai/common/message/EAIMessage.java +++ b/src/main/java/com/eactive/eai/common/message/EAIMessage.java @@ -1,11 +1,11 @@ package com.eactive.eai.common.message; import java.io.Serializable; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import com.eactive.eai.message.StandardMessage; import com.eactive.eai.message.manager.StandardMessageManager; @@ -109,7 +109,8 @@ public class EAIMessage implements EAIMessageKeys, Serializable, Comparable(); @@ -664,6 +665,14 @@ public class EAIMessage implements EAIMessageKeys, Serializable, Comparable getTransactionContextTransfer() { return transactionContextTransfer; } + + public Properties getCallProp() { + return callProp; + } + + public void setCallProp(Properties callProp) { + this.callProp = callProp; + } /** * [비동기 전달 전용] 컨텍스트 전달용 Map 설정 diff --git a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java index 9e63690..f72452a 100644 --- a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java +++ b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java @@ -464,7 +464,9 @@ public class RequestProcessor extends RequestProcessorSupport { logUnknownMessage(vo,orgMessage); return getInboundErrorResponse(prop, standardMessage, mapper, vo.getRspErrorCode(), vo.getRspErrorMsg(), inboundCharset); } - + + eaiMsg.setCallProp(prop); + // set standardMessage & mapper to EAIMessage eaiMsg.setStandardMessage(standardMessage); eaiMsg.setMapper(mapper); @@ -1256,7 +1258,7 @@ public class RequestProcessor extends RequestProcessorSupport { beforeRoute(eaiMsg, prop); retEaiMsg = FlowRouter.process(eaiMsg, prop); - + retEaiMsg.setCallProp(prop); // 응답메시지에 Error Code기 설정되어 있을 경우 // ExceptionHandler를 통해 응답메시지를 생성한다. if(retEaiMsg != null && !MessageUtil.checkRspErrCd(retEaiMsg.getRspErrCd())) { diff --git a/src/main/java/com/eactive/eai/outbound/DefaultProcess.java b/src/main/java/com/eactive/eai/outbound/DefaultProcess.java index 6786e1d..9bfa3fc 100644 --- a/src/main/java/com/eactive/eai/outbound/DefaultProcess.java +++ b/src/main/java/com/eactive/eai/outbound/DefaultProcess.java @@ -776,17 +776,18 @@ public abstract class DefaultProcess extends Process { if(this.tempProp.get(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP) instanceof Map) { Map map = (Map) this.tempProp.get(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP); this.resObject = map.get(HttpAdapterServiceKey.OUTBOUND_RESPONSE_MESSAGE); + this.callProp.put(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP, map); } standardMessage.setBizData(this.resObject, this.inboundCharset); - try { - //mapper.nextGuidSeq(standardMessage); - mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV); - StandardMessageManager standardManager = StandardMessageManager.getInstance(); - standardManager.getMessageCoordinator().coordinateSetStandardMessageError(standardMessage, mapper, - this.resEaiMsg.getRspErrCd(), this.resEaiMsg.getRspErrMsg()); - } catch (Exception e) { - logger.error(e.getMessage()); - } +// try { +// //mapper.nextGuidSeq(standardMessage); +// mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV); +// StandardMessageManager standardManager = StandardMessageManager.getInstance(); +// standardManager.getMessageCoordinator().coordinateSetStandardMessageError(standardMessage, mapper, +// this.resEaiMsg.getRspErrCd(), this.resEaiMsg.getRspErrMsg()); +// } catch (Exception e) { +// logger.error(e.getMessage()); +// } } public boolean isRequest() {