changed to handle empty payload messages

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@586027 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 19 insertions, 0 deletions

diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
index 266cbe4842..4d99a76d7e 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
@@ -79,6 +79,24 @@ public class Disassembler implements Sender<ConnectionEvent>,
     private void fragment(byte flags, byte type, ConnectionEvent event,
                           ByteBuffer buf, boolean first, boolean last)
     {
+        if(!buf.hasRemaining())
+        {
+            //empty data
+              byte nflags = flags;
+            if (first)
+            {
+                nflags |= FIRST_FRAME;
+                first = false;
+            }
+             nflags |= LAST_FRAME;
+              Frame frame = new Frame(nflags, type,
+                                    event.getProtocolEvent().getEncodedTrack(),
+                                    event.getChannel());
+           // frame.addFragment(buf);
+            sender.send(frame);
+        }
+        else
+        {
         while (buf.hasRemaining())
         {
             ByteBuffer slice = buf.slice();
@@ -102,6 +120,7 @@ public class Disassembler implements Sender<ConnectionEvent>,
             frame.addFragment(slice);
             sender.send(frame);
         }
+        }
     }
 
     public void init(ConnectionEvent event, ProtocolHeader header)