ns

src/org/jgroups/Message.java

@@ -244,6 +244,13 @@ final public byte[] getBuffer() {
         }
     }
 
+    /**
+     * <em>
+     * Note that the byte[] buffer passed as argument must not be modified. Reason: if we retransmit the
+     * message, it would still have a ref to the original byte[] buffer passed in as argument, and so we would
+     * retransmit a changed byte[] buffer !
+     * </em>
+     */
     final public Message setBuffer(byte[] b) {
         buf=b;
         if(buf != null) {
@@ -256,7 +263,12 @@ final public Message setBuffer(byte[] b) {
     }
 
     /**
-     * Set the internal buffer to point to a subset of a given buffer
+     * Sets the internal buffer to point to a subset of a given buffer.<p/>
+     * <em>
+     * Note that the byte[] buffer passed as argument must not be modified. Reason: if we retransmit the
+     * message, it would still have a ref to the original byte[] buffer passed in as argument, and so we would
+     * retransmit a changed byte[] buffer !
+     * </em>
      *
      * @param b The reference to a given buffer. If null, we'll reset the buffer to null
      * @param offset The initial position

src/org/jgroups/protocols/RSVP.java

@@ -220,7 +220,7 @@ protected void handleResponse(Address member, short id) {
     protected void sendResponse(Address dest, short id) {
         try {
             Message msg=new Message(dest);
-            msg.setFlag(Message.Flag.RSVP, Message.Flag.OOB);
+            msg.setFlag(Message.Flag.RSVP, Message.Flag.DONT_BUNDLE);
             RsvpHeader hdr=new RsvpHeader(RsvpHeader.RSP,id);
             msg.putHeader(this.id, hdr);
             if(log.isTraceEnabled())

src/org/jgroups/protocols/pbcast/STABLE.java

@@ -262,33 +262,17 @@ protected void handleUpEvent(StableHeader hdr, Address sender) {
         }
     }
 
-    @ManagedAttribute int num_stable_batch_events=0;
-
-    @ManagedAttribute int num_stability_batch_events=0;
-
 
     public void up(MessageBatch batch) {
         StableHeader hdr;
 
-        int stable=0, stability=0;
         for(Message msg: batch) { // remove and handle messages with flow control headers (STABLE_GOSSIP, STABILITY)
             if((hdr=(StableHeader)msg.getHeader(id)) != null) {
                 batch.remove(msg);
-                if(hdr.type == StableHeader.STABLE_GOSSIP)
-                    stable++;
-                if(hdr.type == StableHeader.STABILITY)
-                    stability++;
-
                 handleUpEvent(hdr, batch.sender());
             }
         }
 
-        if(stable > 1)
-            num_stable_batch_events++;
-        if(stability > 1)
-            num_stability_batch_events++;
-
-
         // only if message counting is on, and only for multicast messages (http://jira.jboss.com/jira/browse/JGRP-233)
         if(max_bytes > 0 && batch.dest() == null && !batch.isEmpty()) {
             boolean send_stable_msg=false;