Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4619/hk/hku/cecid/phoenix/message/packaging
Modified Files:
MessageHeader.java
Log Message:
Set Message Id only if messageIdAtr is not null
Index: MessageHeader.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging/MessageHeader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MessageHeader.java 4 Jan 2006 18:49:07 -0000 1.18
--- MessageHeader.java 6 Jan 2006 16:22:00 -0000 1.19
***************
*** 1067,1093 ****
/**
! * Set messageId. This property can be set only once.
*
! * @param messageId Unique message identifier.
! * @throws SOAPException
*/
! public void setMessageId(String messageId) throws SOAPException {
! if (this.messageId == null) {
! this.messageId = messageId;
! if (cpaId != null && conversationId != null && service != null &&
! action != null) {
! messageData.addChildElement(ELEMENT_MESSAGE_ID, messageId);
! if (timestamp != null) {
! messageData.addChildElement(ELEMENT_TIMESTAMP, timestamp);
! addRefToMessageId();
}
}
! }
! else {
! throw new SOAPValidationException
! (SOAPValidationException.SOAP_FAULT_CLIENT,
! "<" + NAMESPACE_PREFIX_EB + ":" + ELEMENT_MESSAGE_ID
! + "> has already been set in <" + NAMESPACE_PREFIX_EB
! + ":" + MESSAGE_HEADER + ">!");
}
}
--- 1067,1103 ----
/**
! * Set messageId. This property can be set only once.
*
! * @param messageIdAtr
! * Unique message identifier.
! * @throws SOAPException
*/
! public void setMessageId(String messageIdAtr) throws SOAPException {
!
! /** Set MessageId only if messageIdAtr is not null **/
! if (messageIdAtr != null) {
!
! if (this.messageId == null) {
! this.messageId = messageIdAtr;
! if (cpaId != null && conversationId != null && service != null
! && action != null) {
! messageData.addChildElement(ELEMENT_MESSAGE_ID,
! messageIdAtr);
! if (timestamp != null) {
! messageData.addChildElement(ELEMENT_TIMESTAMP,
! timestamp);
! addRefToMessageId();
! }
}
+ } else {
+ throw new SOAPValidationException(
+ SOAPValidationException.SOAP_FAULT_CLIENT, "<"
+ + NAMESPACE_PREFIX_EB + ":"
+ + ELEMENT_MESSAGE_ID
+ + "> has already been set in <"
+ + NAMESPACE_PREFIX_EB + ":" + MESSAGE_HEADER
+ + ">!");
}
!
}
}
|
