From e0bf5acc51a983b2cb5c3d959b513d21a2cb57c1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 18 Sep 2007 16:05:48 +0000 Subject: * rubygen/templates/Proxy.rb, src/qpid/framing/Proxy.cpp, Proxy.h: Drop ChannelAdapter, construct Proxy from FrameHandler. * src/qpid/framing/amqp_types.h: Added missing decl for class Uuid. * src/qpid/broker/HandlerImpl.h, src/qpid/broker/ConnectionAdapter.cpp: Fix Proxy constructor calls * src/qpid/framing/AMQFrame.h (class AMQFrame): construct from AMQBody only. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@576963 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/ConnectionAdapter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker/ConnectionAdapter.cpp') diff --git a/cpp/src/qpid/broker/ConnectionAdapter.cpp b/cpp/src/qpid/broker/ConnectionAdapter.cpp index 7672daed10..c38800f458 100644 --- a/cpp/src/qpid/broker/ConnectionAdapter.cpp +++ b/cpp/src/qpid/broker/ConnectionAdapter.cpp @@ -22,6 +22,7 @@ #include "ConnectionAdapter.h" #include "Connection.h" +#include "qpid/framing/ChannelAdapter.h" using namespace qpid; using namespace qpid::broker; @@ -75,7 +76,7 @@ ConnectionAdapter::ConnectionAdapter(Connection& connection) } ConnectionAdapter::Handler:: Handler(Connection& c, ConnectionAdapter& a) : - proxy(a), client(proxy.getConnection()), connection(c) {} + proxy(a.getHandlers().out), client(proxy.getConnection()), connection(c) {} void ConnectionAdapter::Handler::startOk(const FieldTable& /*clientProperties*/, -- cgit v1.2.1