CVS update: JGroups/src/org/jgroups/protocols/pbcast NAKACK.java

  User: belaban 
  Date: 10/11/08 08:57:01

  Modified:    src/org/jgroups/protocols/pbcast NAKACK.java
  Log:
  protocols check if NO_RELIABILITY or NO_TOTAL_ORDER flags are set to bypass (https://jira.jboss.org/browse/JGRP-1250)
  
  Revision  Changes    Path
  1.261     +5 -3      JGroups/src/org/jgroups/protocols/pbcast/NAKACK.java
  
  Index: NAKACK.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/protocols/pbcast/NAKACK.java,v
  retrieving revision 1.260
  retrieving revision 1.261
  diff -u -r1.260 -r1.261
  --- NAKACK.java	22 Sep 2010 08:16:55 -0000	1.260
  +++ NAKACK.java	8 Nov 2010 08:57:01 -0000	1.261
  @@ -32,7 +32,7 @@
    * instead of the requester by setting use_mcast_xmit to true.
    *
    * @author Bela Ban
  - * @version $Id: NAKACK.java,v 1.260 2010/09/22 08:16:55 belaban Exp $
  + * @version $Id: NAKACK.java,v 1.261 2010/11/08 08:57:01 belaban Exp $
    */
   @MBean(description="Reliable transmission multipoint FIFO protocol")
   @DeprecatedProperty(names={"max_xmit_size", "eager_lock_release", "stats_list_size"})
  @@ -554,9 +554,9 @@
               case Event.MSG:
                   Message msg=(Message)evt.getArg();
                   Address dest=msg.getDest();
  -                if(dest != null && !dest.isMulticastAddress()) {
  +                if(dest != null && !dest.isMulticastAddress() || msg.isFlagSet(Message.NO_RELIABILITY))
                       break; // unicast address: not null and not mcast, pass down unchanged
  -                }
  +
                   send(evt, msg);
                   return null;    // don't pass down the stack
   
  @@ -652,6 +652,8 @@
   
           case Event.MSG:
               Message msg=(Message)evt.getArg();
  +            if(msg.isFlagSet(Message.NO_RELIABILITY))
  +                break;
               NakAckHeader hdr=(NakAckHeader)msg.getHeader(this.id);
               if(hdr == null)
                   break;  // pass up (e.g. unicast msg)
  
  
  

------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a 
Billion" shares his insights and actions to help propel your 
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev