Author: tross
Date: Fri Jan 16 12:57:47 2009
New Revision: 735126
URL: http://svn.apache.org/viewvc?rev=735126&view=rev
Log:
QPID-1542 - Applied Ian's patch
Modified:
qpid/trunk/qpid/ruby/lib/qpid/qmf.rb
Modified: qpid/trunk/qpid/ruby/lib/qpid/qmf.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/lib/qpid/qmf.rb?rev=735126&r1=735125&r2=735126&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/lib/qpid/qmf.rb (original)
+++ qpid/trunk/qpid/ruby/lib/qpid/qmf.rb Fri Jan 16 12:57:47 2009
@@ -962,8 +962,17 @@
unless object_id == newer.object_id
raise "Objects with different object-ids"
end
- @properties = newer.getProperties unless newer.properties.empty?
- @statistics = newer.getStatistics unless newer.statistics.empty?
+ @properties = newer.properties unless newer.properties.empty?
+ @statistics = newer.statistics unless newer.statistics.empty?
+ end
+
+ def update
+ obj = @session.object(:object_id => @object_id, :broker => @broker)
+ if obj
+ merge_update(obj)
+ else
+ raise "Underlying object no longer exists."
+ end
end
def to_s
