Author: tross
Date: Thu Jul 22 21:57:37 2010
New Revision: 966871
URL: http://svn.apache.org/viewvc?rev=966871&view=rev
Log:
Bugfix: agent label in wrapped (python, ruby) qmf agent was not transmitted to
the
consoles.
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py
qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb?rev=966871&r1=966870&r2=966871&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb Thu Jul 22 21:57:37
2010
@@ -231,7 +231,7 @@ class App < Qmf::AgentHandler
@settings.set_attr("host", ARGV[0]) if ARGV.size > 0
@settings.set_attr("port", ARGV[1].to_i) if ARGV.size > 1
@connection = Qmf::Connection.new(@settings)
- @agent = Qmf::Agent.new(self)
+ @agent = Qmf::Agent.new(self, "agent_test_label")
@model = Model.new
@model.register(@agent)
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py?rev=966871&r1=966870&r2=966871&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py Thu Jul 22 21:57:37
2010
@@ -263,7 +263,7 @@ class App(qmf.AgentHandler):
self._connection = qmf.Connection(self._settings)
# Instantiate an Agent to serve me queries and method calls
- self._agent = qmf.Agent(self)
+ self._agent = qmf.Agent(self, "agent_test_label")
# Dynamically define the parent and child schemas, then
# register them with the agent
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb?rev=966871&r1=966870&r2=966871&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb Thu Jul 22
21:57:37 2010
@@ -204,7 +204,7 @@ class ConsoleTest < ConsoleTestBase
def test_D_get_with_agent
agents = @qmfc.agents
agents.each do |agent|
- if agent.label == "qmfa"
+ if agent.label == "agent_test_label"
parent = @qmfc.object(:class => "parent", :agent => agent)
assert(parent, "Number of parent objects")
return
Modified: qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp?rev=966871&r1=966870&r2=966871&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp Thu Jul 22 21:57:37 2010
@@ -238,7 +238,7 @@ AgentImpl::AgentImpl(char* _label, bool
assignedBrokerBank(0), assignedAgentBank(0),
bootSequence(1), nextObjectId(1), nextContextNum(1), attachComplete(false)
{
- queueName += label;
+ queueName += Uuid(true).str();
}
AgentImpl::~AgentImpl()
@@ -334,7 +334,7 @@ void AgentImpl::startProtocol()
Buffer buffer(rawbuffer, 512);
Protocol::encodeHeader(buffer, Protocol::OP_ATTACH_REQUEST);
- buffer.putShortString("qmfa");
+ buffer.putShortString(label);
systemId.encode(buffer);
buffer.putLong(requestedBrokerBank);
buffer.putLong(requestedAgentBank);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
