Added protocol module for codepoint definitions and header handling.

Fixed a deadlock case in ResilientConnection.
Added more code to the ConsoleEngine implementation.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@809728 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 2 deletions

diff --git a/qpid/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
index 38c42b5aa7..2df6e8646d 100644
--- a/qpid/cpp/bindings/qmf/ruby/qmf.rb
+++ b/qpid/cpp/bindings/qmf/ruby/qmf.rb
@@ -536,7 +536,7 @@ module Qmf
   class Console
     attr_reader :impl
 
-    def initialize(handler, kwargs={})
+    def initialize(handler = nil, kwargs={})
       @handler = handler
       @impl = Qmfengine::ConsoleEngine.new
       @event = Qmfengine::ConsoleEvent.new
@@ -587,6 +587,7 @@ module Qmf
       valid = @impl.getEvent(@event)
       while valid
         count += 1
+        puts "Console Event: #{@event.kind}"
         case @event.kind
         when Qmfengine::ConsoleEvent::AGENT_ADDED
         when Qmfengine::ConsoleEvent::AGENT_DELETED
diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console.rb b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
index c7ee9c3686..c59ec0334c 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
@@ -29,7 +29,7 @@ class App < Qmf::ConsoleHandler
     @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)
-    @qmf = Qmf::Console.new(self)
+    @qmf = Qmf::Console.new
 
     @qmf.add_connection(@connection)