[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/handler MessageServer.java,1.135,1.136

[<cy...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv31338

Modified Files:
	MessageServer.java 
Log Message:
Bug fix: already delivered message cannot be delivered again.


Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** MessageServer.java	20 May 2003 09:40:34 -0000	1.135
--- MessageServer.java	22 May 2003 03:26:40 -0000	1.136
***************
*** 1191,1200 ****
                  if (isDelivered) {
                      if (seqNo == FIRST_MESSAGE_DELIVERED) {
!                         String err = ErrorMessages.getMessage(
!                             ErrorMessages.ERR_DB_DATA_INCONSISTENT, 
!                             "delivered message is set to <delivered> status "
!                             + "again");
!                         logger.warn(err);
!                         throw new MessageServerException(err);
                      }
                      else {
--- 1191,1198 ----
                  if (isDelivered) {
                      if (seqNo == FIRST_MESSAGE_DELIVERED) {
!                         logger.info("messageId=<" + messageId +
!                             "> is delivered again");
!                         newSeqNo = seqNo;
!                         throw new MessageServerException("");
                      }
                      else {
***************
*** 1324,1333 ****
                  if (isDelivered) {
                      if (seqNo == FIRST_MESSAGE_DELIVERED) {
!                         String err = ErrorMessages.getMessage(
!                             ErrorMessages.ERR_DB_DATA_INCONSISTENT, 
!                             "delivered message is set to <delivered> status "
!                             + "again");
!                         logger.warn(err);
!                         throw new MessageServerException(err);
                      }
                      else {
--- 1322,1329 ----
                  if (isDelivered) {
                      if (seqNo == FIRST_MESSAGE_DELIVERED) {
!                         logger.info("filename=<" + filename +
!                             "> is delivered again");
!                         newSeqNo = seqNo;
!                         throw new MessageServerException("");
                      }
                      else {