[jboss-cvs] jboss-jms/src/main/org/jboss/messaging/core/distributed/replicator ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/27 15:01:56

  Modified:    src/main/org/jboss/messaging/core/distributed/replicator 
                        ReplicatorOutput.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.19      +3 -3      jboss-jms/src/main/org/jboss/messaging/core/distributed/replicator/ReplicatorOutput.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatorOutput.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/distributed/replicator/ReplicatorOutput.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- ReplicatorOutput.java	22 Mar 2006 10:23:33 -0000	1.18
  +++ ReplicatorOutput.java	27 Jul 2006 19:01:56 -0000	1.19
  @@ -63,9 +63,9 @@
    * the replicator works pretty much like a distributed PointToMultipointRouter.
    *
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version <tt>$Revision: 1.18 $</tt>
  + * @version <tt>$Revision: 1.19 $</tt>
    *
  - * $Id: ReplicatorOutput.java,v 1.18 2006/03/22 10:23:33 timfox Exp $
  + * $Id: ReplicatorOutput.java,v 1.19 2006/07/27 19:01:56 timfox Exp $
    */
   public class ReplicatorOutput extends ReplicatorPeer implements Distributed, ReplicatorOutputFacade
   {
  @@ -451,7 +451,7 @@
            sendAsynchronousResponse(collectorAddress, new Long(ref.getMessageID()), Acknowledgment.ACCEPTED);
         }
   
  -      public void cancel(Delivery d) throws Throwable
  +      public void cancel(Delivery d) throws Exception
         {
            MessageReference ref = d.getReference();