From fda6dadde945a9c73c97b73dc79e93368b743348 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 29 Jun 2007 17:59:00 +0000
Subject: 	* Summary: 	 - Improved plugin framework and
 HandlerUpdater interface. 	 - Cluster handlers for traffic to/from
 cluster. 	 - Cluster HandlerUpdater configures channel chains for
 cluster. 	 - Cluster PluginProvider registers cluster objects with
 broker.

	* src/qpid/framing/AMQFrame.h: Made data members public. Handlers
	need to be able to modify frame data, getters/setters are just a
	nuisance here.

	* src/tests/Cluster.cpp: Updated for cluster changes, using
	handlers instead of friendship to hook test into Cluster code.

	* src/qpid/framing/amqp_types.h: Added CHANNEL_MAX and
	CHANNEL_HIGH_BIT constants.

	* src/qpid/framing/HandlerUpdater.h: Renamed ChannelInitializer,
	broke dependency on broker channel types.

	* src/qpid/framing/Handler.h: Added constructors and nextHandler()

	* src/qpid/framing/AMQFrame.h (class AMQFrame): Inlined getChannel()

	* src/qpid/cluster/ClusterPluginProvider.cpp: Provider for cluster
	plugins.

	* src/qpid/cluster/Cluster.cpp: Use ChannelManager. Factor out
	plugin details to ClusterPluginProvider.

	* src/qpid/cluster/ChannelManager.h: Insert cluster handlers
	into channel chains, route frames between cluster and channels.

	* src/qpid/broker/BrokerAdapter.cpp (startOk): use CHANNEL_MAX
	constant.

	* src/qpid/broker/Broker.cpp:
	 - Refactored for new plugin framework.
	 - Added getUrl().

	* src/qpid/Url.h: Added constructor from Address.

	* src/qpid/Plugin.h: Generalized plugin framework, broke
	dependency on Broker interfaces. We may want to use plug-ins for
	clients also at some point.

	* src/tests/run_test: Fix bug when VALGRIND is not set.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551981 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/Url.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'cpp/src/qpid/Url.cpp')

diff --git a/cpp/src/qpid/Url.cpp b/cpp/src/qpid/Url.cpp
index b9c17ffd82..d52fc71870 100644
--- a/cpp/src/qpid/Url.cpp
+++ b/cpp/src/qpid/Url.cpp
@@ -100,14 +100,13 @@ struct UrlGrammar : public grammar<UrlGrammar>
     };
 };
 
-Url::Url(const string& url) {
-    if (!parse(url.c_str(), UrlGrammar(*this)).full)
-        throw InvalidUrl("Invalid AMQP url: "+url);
-    // TODO aconway 2007-06-15: Better error handling?
+void Url::parse(const char* url) {
+    if (!boost::spirit::parse(url, UrlGrammar(*this)).full)
+        throw InvalidUrl(string("Invalid AMQP url: ")+url);
 }
 
-Url::Url(const string& url, const nothrow_t&) {
-    if (!parse(url.c_str(), UrlGrammar(*this)).full)
+void Url::parseNoThrow(const char* url) {
+    if (!boost::spirit::parse(url, UrlGrammar(*this)).full)
         clear();
 }
 
-- 
cgit v1.2.1