svn commit: r668308 - /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java

[rhs]

Author: rhs
Date: Mon Jun 16 14:01:51 2008
New Revision: 668308

URL: http://svn.apache.org/viewvc?rev=668308&view=rev
Log:
QPID-901: set the frame track correctly

Modified:
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java?rev=668308&r1=668307&r2=668308&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
 Mon Jun 16 14:01:51 2008
@@ -80,6 +80,8 @@
     private void fragment(byte flags, SegmentType type, ConnectionEvent event,
                           ByteBuffer buf, boolean first, boolean last)
     {
+        byte track = event.getProtocolEvent().getEncodedTrack() == Frame.L4 ? 
(byte) 1 : (byte) 0;
+
         if(!buf.hasRemaining())
         {
             //empty data
@@ -90,9 +92,7 @@
                 first = false;
             }
             nflags |= LAST_FRAME;
-            Frame frame = new Frame(nflags, type,
-                                    event.getProtocolEvent().getEncodedTrack(),
-                                    event.getChannel());
+            Frame frame = new Frame(nflags, type, track, event.getChannel());
             // frame.addFragment(buf);
             sender.send(frame);
         }
@@ -115,9 +115,7 @@
                     newflags |= LAST_FRAME;
                 }
 
-                Frame frame = new Frame(newflags, type,
-                                        
event.getProtocolEvent().getEncodedTrack(),
-                                        event.getChannel());
+                Frame frame = new Frame(newflags, type, track, 
event.getChannel());
                 frame.addFragment(slice);
                 sender.send(frame);
             }