[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool HouseKeeperController.java,1.4,1.5

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17044/src/java/org/logicalcobwebs/proxool

Modified Files:
	HouseKeeperController.java 
Log Message:
More robust round robin of house keepers.

Index: HouseKeeperController.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/HouseKeeperController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HouseKeeperController.java	26 Mar 2004 15:58:56 -0000	1.4
--- HouseKeeperController.java	2 Jun 2004 20:38:32 -0000	1.5
***************
*** 52,64 ****
          synchronized (LOCK) {
              for (int i = 0; i < houseKeeperList.size(); i++) {
!                 if (houseKeeperIndex > houseKeeperList.size() - 1) {
                      houseKeeperIndex = 0;
                  }
-                 HouseKeeper hk = (HouseKeeper) houseKeeperList.get(houseKeeperIndex);
-                 houseKeeperIndex++;
-                 if (hk.isSweepDue()) {
-                     houseKeeper = hk;
-                     break;
-                 }
              }
          }
--- 52,66 ----
          synchronized (LOCK) {
              for (int i = 0; i < houseKeeperList.size(); i++) {
!                 HouseKeeper hk = null;
!                 try {
!                     hk = (HouseKeeper) houseKeeperList.get(houseKeeperIndex);
!                     if (hk.isSweepDue()) {
!                         houseKeeper = hk;
!                         break;
!                     }
!                     houseKeeperIndex++;
!                 } catch (IndexOutOfBoundsException e) {
                      houseKeeperIndex = 0;
                  }
              }
          }
***************
*** 129,132 ****
--- 131,137 ----
   Revision history:
   $Log$
+  Revision 1.5  2004/06/02 20:38:32  billhorsman
+  More robust round robin of house keepers.
+ 
   Revision 1.4  2004/03/26 15:58:56  billhorsman
   Fixes to ensure that house keeper and prototyper threads finish after shutdown.