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

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

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

Modified Files:
      Tag: b0931
	MessageServer.java 
Log Message:
Bug fix: getSentSequenceMap() should consider only those messages with
message orders, i.e. sequence number >= 0 or <=-1000.


Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.119.2.10
retrieving revision 1.119.2.11
diff -C2 -d -r1.119.2.10 -r1.119.2.11
*** MessageServer.java	22 May 2003 03:25:53 -0000	1.119.2.10
--- MessageServer.java	25 Jul 2003 16:13:50 -0000	1.119.2.11
***************
*** 627,633 ****
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage(
!                 ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 627,633 ----
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage
!                 (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 687,693 ****
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage(
!                 ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 687,693 ----
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage
!                 (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 746,752 ****
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage(
!                 ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err); 
              exception = new MessageServerException(err);
          }
--- 746,752 ----
          }
          catch (Exception e) {
!             String err = ErrorMessages.getMessage
!                 (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
!             logger.error(err);
              exception = new MessageServerException(err);
          }
***************
*** 2841,2847 ****
                          "MAX(" + DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER + ")"
                      },
!                     new String [] { DbTableManager.ATTRIBUTE_STATE },
!                     new int [] { DbTableManager.GREATER_EQUAL },
!                     new String [] { String.valueOf(SENT_FROM_RANGE) },
                      null,
                      new String [] { DbTableManager.ATTRIBUTE_CONVERSATION_ID }
--- 2841,2853 ----
                          "MAX(" + DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER + ")"
                      },
!                     new String [] { DbTableManager.ATTRIBUTE_STATE,
!                                     DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER,
!                                     DbTableManager.ATTRIBUTE_SEQUENCE_NUMBER },
!                     new int [] { DbTableManager.GREATER_EQUAL,
!                                  DbTableManager.LESS_EQUAL, 
!                                  DbTableManager.GREATER_EQUAL },
!                     new String [] { String.valueOf(SENT_FROM_RANGE),
!                         String.valueOf(FIRST_MESSAGE_ORDER_DELIVERED),
!                         String.valueOf(FIRST_MESSAGE_ORDER_UNDELIVERED) },
                      null,
                      new String [] { DbTableManager.ATTRIBUTE_CONVERSATION_ID }
***************
*** 2952,2955 ****
--- 2958,2962 ----
                      deliveryMap.put(conversationId, deliveryRecord);
                  }
+                 logger.debug("conversation id: " + conversationId);
                  deliveryRecord.addUndelivered(seqNo);
              }