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

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

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

Modified Files:
	MessageServer.java 
Log Message:
Upon reconstructing sentSequenceMap, sequence numbers of those messages
without MessageOrder (-9999 <= seqNo <= -1) should not be taken into
account.


Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** MessageServer.java	27 May 2003 06:53:30 -0000	1.137
--- MessageServer.java	29 May 2003 14:20:16 -0000	1.138
***************
*** 629,633 ****
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 629,633 ----
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 689,693 ****
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 689,693 ----
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 748,752 ****
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 748,752 ----
              String err = ErrorMessages.getMessage
                  (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 2864,2868 ****
                  .append("mi.").append(DbTableManager.ATTRIBUTE_MESSAGE_ID)
                  .append(" AND ").append(DbTableManager.ATTRIBUTE_STATE)
!                 .append(">=").append(SENT_FROM_RANGE).append(" GROUP BY ")
                  .append("mi.").append(DbTableManager.ATTRIBUTE_CONVERSATION_ID);
              sentQuery = tx.getConnection().prepareStatement(sql.toString());
--- 2864,2872 ----
                  .append("mi.").append(DbTableManager.ATTRIBUTE_MESSAGE_ID)
                  .append(" AND ").append(DbTableManager.ATTRIBUTE_STATE)
!                 .append(">=").append(SENT_FROM_RANGE).append(" AND ")
!                 .append(DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER).append("<=")
!                 .append(FIRST_MESSAGE_ORDER_DELIVERED).append(" AND ")
!                 .append(DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER).append(">=")
!                 .append(FIRST_MESSAGE_ORDER_UNDELIVERED).append(" GROUP BY ")
                  .append("mi.").append(DbTableManager.ATTRIBUTE_CONVERSATION_ID);
              sentQuery = tx.getConnection().prepareStatement(sql.toString());