summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-06-16 21:01:51 +0000
committerRafael H. Schloming <rhs@apache.org>2008-06-16 21:01:51 +0000
commit35790b4c769bb7a49dbb89e41adc41e8c4156676 (patch)
tree445bce4c99bd93ba51a5d6cef20b2241c64aac40
parent0a5ad579eaf14ddbe6a9396489f59c80ca669564 (diff)
downloadqpid-python-35790b4c769bb7a49dbb89e41adc41e8c4156676.tar.gz
QPID-901: set the frame track correctly
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@668308 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java10
1 files changed, 4 insertions, 6 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 709b4f0e02..da9ba84ab0 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
@@ -80,6 +80,8 @@ public class Disassembler implements Sender<ConnectionEvent>,
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 @@ public class Disassembler implements Sender<ConnectionEvent>,
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 @@ public class Disassembler implements Sender<ConnectionEvent>,
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);
}