[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/handler DeliveryRecord.java,1.8,1.9

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

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

Modified Files:
	DeliveryRecord.java 
Log Message:
Bug fix: lastDelivered should be reset to -1 if the last message is really
delivered and there is no more undelivered message left. Thus, this
DeliveryRecord can be reused to received MessageOrder for the same
conversationId.


Index: DeliveryRecord.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/DeliveryRecord.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DeliveryRecord.java	18 May 2003 02:16:08 -0000	1.8
--- DeliveryRecord.java	25 May 2003 04:12:26 -0000	1.9
***************
*** 110,113 ****
--- 110,114 ----
  
      private int lastDelivered;
+     private int prevLastDelivered;
      private Set undeliveredSet;
  
***************
*** 115,118 ****
--- 116,120 ----
          undeliveredSet = new TreeSet();
          lastDelivered = -1;
+         prevLastDelivered = 0;
      }
  
***************
*** 124,132 ****
          lastDelivered++;
          undeliveredSet.remove(new Integer(lastDelivered));
      }
  
      void decLastDelivered() {
!         undeliveredSet.add(new Integer(lastDelivered));
!         lastDelivered--;
      }
  
--- 126,145 ----
          lastDelivered++;
          undeliveredSet.remove(new Integer(lastDelivered));
+         if (undeliveredSet.isEmpty()) {
+             prevLastDelivered = lastDelivered;
+             lastDelivered = -1;
+         }
      }
  
      void decLastDelivered() {
!         if (lastDelivered != -1) {
!             undeliveredSet.add(new Integer(lastDelivered));
!             lastDelivered--;
!         }
!         else {
!             undeliveredSet.add(new Integer(prevLastDelivered));
!             lastDelivered = prevLastDelivered - 1;
!             prevLastDelivered = 0;
!         }
      }