Author: aconway
Date: Thu Nov 30 08:41:52 2006
New Revision: 480994
URL: http://svn.apache.org/viewvc?view=rev&rev=480994
Log:
Patches from Andrew Stitcher to fix QPID-140, QPID-141.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
incubator/qpid/trunk/qpid/cpp/test/bin/topictest
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp?view=diff&rev=480994&r1=480993&r2=480994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp Thu Nov 30
08:41:52 2006
@@ -24,20 +24,24 @@
using namespace qpid::framing;
-// AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to
that version
-AMQFrame::AMQFrame() : versionMap(8, 0) {}
+// This only works as a static as the version is currently fixed to 8.0
+// TODO: When the class is version-aware this will need to change
+AMQP_MethodVersionMap AMQFrame::versionMap(8,0);
+
+// AMQP version management change - kpvdr 2-11-17
+// TODO: Make this class version-aware
+AMQFrame::AMQFrame() {}
// AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to
that version
+// TODO: Make this class version-aware
AMQFrame::AMQFrame(u_int16_t _channel, AMQBody* _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
{}
// AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to
that version
+// TODO: Make this class version-aware
AMQFrame::AMQFrame(u_int16_t _channel, AMQBody::shared_ptr& _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
{}
AMQFrame::~AMQFrame() {}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h?view=diff&rev=480994&r1=480993&r2=480994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h Thu Nov 30
08:41:52 2006
@@ -37,10 +37,11 @@
class AMQFrame : virtual public AMQDataBlock
{
+ static AMQP_MethodVersionMap versionMap;
+
u_int16_t channel;
u_int8_t type;//used if the body is decoded separately from the
'head'
AMQBody::shared_ptr body;
- AMQP_MethodVersionMap versionMap;
AMQBody::shared_ptr createMethodBody(Buffer& buffer);
public:
Modified: incubator/qpid/trunk/qpid/cpp/test/bin/topictest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/bin/topictest?view=diff&rev=480994&r1=480993&r2=480994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/bin/topictest (original)
+++ incubator/qpid/trunk/qpid/cpp/test/bin/topictest Thu Nov 30 08:41:52 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Run the c++ or java topic test
. `dirname $0`/env
