Author: aconway
Date: Fri Feb 16 19:54:15 2007
New Revision: 508706
URL: http://svn.apache.org/viewvc?view=rev&rev=508706
Log:
ClientChannel: removed server proxy, not used.
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.cpp
incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.cpp?view=diff&rev=508706&r1=508705&r2=508706
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.cpp Fri Feb
16 19:54:15 2007
@@ -24,7 +24,6 @@
#include <QpidError.h>
#include <MethodBodyInstances.h>
#include "Connection.h"
-#include "AMQP_ServerProxy.h"
// FIXME aconway 2007-01-26: Evaluate all throws, ensure consistent
// handling of errors that should close the connection or the channel.
@@ -49,18 +48,12 @@
close();
}
-AMQP_ServerProxy& Channel::brokerProxy() {
- assert(proxy.get());
- return *proxy;
-}
-
void Channel::open(ChannelId id, Connection& con)
{
if (isOpen())
THROW_QPID_ERROR(INTERNAL_ERROR, "Attempt to re-open channel "+id);
connection = &con;
init(id, con, con.getVersion()); // ChannelAdapter initialization.
- proxy.reset(new AMQP_ServerProxy(*this));
string oob;
if (id != 0)
sendAndReceive<ChannelOpenOkBody>(new ChannelOpenBody(version, oob));
@@ -77,12 +70,11 @@
string mechanism("PLAIN");
string response = ((char)0) + uid + ((char)0) + pwd;
string locale("en_US");
- // TODO aconway 2007-01-26: Move client over to proxy model,
- // symmetric with server.
ConnectionTuneBody::shared_ptr proposal =
sendAndReceive<ConnectionTuneBody>(
new ConnectionStartOkBody(
- version, responses.getRequestId(), props, mechanism, response,
locale));
+ version, responses.getRequestId(), props, mechanism,
+ response, locale));
/**
* Assume for now that further challenges will not be required
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h?view=diff&rev=508706&r1=508705&r2=508706
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h Fri Feb 16
19:54:15 2007
@@ -43,7 +43,6 @@
namespace framing {
class ChannelCloseBody;
-class AMQP_ServerProxy;
class AMQMethodBody;
}
@@ -109,7 +108,6 @@
u_int16_t prefetch;
const bool transactional;
framing::ProtocolVersion version;
- boost::scoped_ptr<framing::AMQP_ServerProxy> proxy;
void enqueue();
void retrieve(Message& msg);
@@ -366,17 +364,6 @@
void setReturnedMessageHandler(ReturnedMessageHandler* handler);
bool isOpen() const;
-
- /**
- * Returns a proxy for the "raw" AMQP broker protocol. Only for use by
- * protocol experts.
- */
- framing::AMQP_ServerProxy& brokerProxy();
-
- /**
- * Wait for the next method from the broker.
- */
- framing::AMQMethodBody::shared_ptr receive();
};
}}
