You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/04/15 21:44:45 UTC
svn commit: r1587710 - /qpid/trunk/qpid/python/qpid/framing.py
Author: gsim
Date: Tue Apr 15 19:44:45 2014
New Revision: 1587710
URL: http://svn.apache.org/r1587710
Log:
QPID-5700: ensure interleaved segments on different tracks do not get confused
Modified:
qpid/trunk/qpid/python/qpid/framing.py
Modified: qpid/trunk/qpid/python/qpid/framing.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/framing.py?rev=1587710&r1=1587709&r2=1587710&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/framing.py (original)
+++ qpid/trunk/qpid/python/qpid/framing.py Tue Apr 15 19:44:45 2014
@@ -252,31 +252,35 @@ class OpEncoder:
class OpDecoder:
def __init__(self):
- self.op = None
+ self.current_op = {}
self.ops = []
def write(self, *segments):
for seg in segments:
+ op = self.current_op.get(seg.track)
if seg.first:
if seg.type == segment_type.command:
- self.op = self.decode_command(seg.payload)
+ op = self.decode_command(seg.payload)
elif seg.type == segment_type.control:
- self.op = self.decode_control(seg.payload)
+ op = self.decode_control(seg.payload)
else:
raise ValueError(seg)
- self.op.channel = seg.channel
+ op.channel = seg.channel
elif seg.type == segment_type.header:
- if self.op.headers is None:
- self.op.headers = []
- self.op.headers.extend(self.decode_headers(seg.payload))
+ if op.headers is None:
+ op.headers = []
+ op.headers.extend(self.decode_headers(seg.payload))
elif seg.type == segment_type.body:
- if self.op.payload is None:
- self.op.payload = seg.payload
+ if op.payload is None:
+ op.payload = seg.payload
else:
- self.op.payload += seg.payload
+ op.payload += seg.payload
if seg.last:
- self.ops.append(self.op)
- self.op = None
+ self.ops.append(op)
+ if seg.track in self.current_op:
+ del self.current_op[seg.track]
+ else:
+ self.current_op[seg.track] = op
def decode_command(self, encoded):
sc = StringCodec(encoded)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org