[Ubermq-commits] jms/src/com/ubermq/jms/server/routing/impl Router.java,1.8,1.9

[<ji...@us...>]

Update of /cvsroot/ubermq/jms/src/com/ubermq/jms/server/routing/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv10822/src/com/ubermq/jms/server/routing/impl

Modified Files:
	Router.java 
Log Message:
bug fixes, and final classes


Index: Router.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/routing/impl/Router.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Router.java	26 Oct 2002 15:54:13 -0000	1.8
--- Router.java	17 Dec 2002 14:52:25 -0000	1.9
***************
*** 109,113 ****
      public Collection getRoutesTo(RouteDestNode dest)
      {
!         ArrayList toRemove = new ArrayList();
  
          for(Iterator i = routes.iterator();i.hasNext();)
--- 109,113 ----
      public Collection getRoutesTo(RouteDestNode dest)
      {
!         Set toRemove = new HashSet();
  
          for(Iterator i = routes.iterator();i.hasNext();)
***************
*** 121,125 ****
      }
  
!     public Set getExcludedSet(SourceSpec spec)
      {
          Set exclusionSet = new TreeSet();
--- 121,147 ----
      }
  
!     /**
!      * Does a reverse-lookup and returns a collection of
!      * <code>BoundRoute</code> objects that are the mappings
!      * such that <code>BoundRoute.dest.equals(dest)</code>.
!      *
!      * @return Collection of BoundRoute objects
!      * @param dest the destination
!      */
!     private Collection getBoundRoutesTo(RouteDestNode dest)
!     {
!         Set toRemove = new HashSet();
! 
!         for(Iterator i = routes.iterator();i.hasNext();)
!         {
!             BoundRoute br = (BoundRoute)i.next();
!             if (br.dest.equals(dest))
!                 toRemove.add(br);
!         }
! 
!         return toRemove;
!     }
! 
!     private Set getExcludedSet(SourceSpec spec)
      {
          Set exclusionSet = new TreeSet();
***************
*** 217,221 ****
      {
          // remove routes
!         Collection toRemove = getRoutesTo(node);
          for(Iterator j = toRemove.iterator();j.hasNext();)
              routes.remove(j.next());
--- 239,243 ----
      {
          // remove routes
!         Collection toRemove = getBoundRoutesTo(node);
          for(Iterator j = toRemove.iterator();j.hasNext();)
              routes.remove(j.next());