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

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

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

Modified Files:
	DeliveryRecord.java 
Log Message:
Revert to the version 1.8. Previous bug fix leads to ambiguity in
delivering MessageOrder messages.


Index: DeliveryRecord.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/DeliveryRecord.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DeliveryRecord.java	27 May 2003 02:21:51 -0000	1.10
--- DeliveryRecord.java	28 May 2003 07:34:43 -0000	1.11
***************
*** 109,113 ****
  
      private int lastDelivered;
-     private int prevLastDelivered;
      private Set undeliveredSet;
  
--- 109,112 ----
***************
*** 115,119 ****
          undeliveredSet = new TreeSet();
          lastDelivered = -1;
-         prevLastDelivered = 0;
      }
  
--- 114,117 ----
***************
*** 125,144 ****
          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;
!         }
      }
  
--- 123,131 ----
          lastDelivered++;
          undeliveredSet.remove(new Integer(lastDelivered));
      }
  
      void decLastDelivered() {
!         undeliveredSet.add(new Integer(lastDelivered));
!         lastDelivered--;
      }