@@ -246,11 +246,13 @@ module Roby::Transactions # Transaction proxies do not have history def history; "" end def plan=(new_plan) # :nodoc: - if new_plan && new_plan.plan != __getobj__.plan - raise "invalid plan #{new_plan}" - elsif !new_plan.kind_of?(Roby::Transaction) - raise "trying to insert a transaction proxy in something else than a transaction (#{new_plan})" - end + if new_plan + if new_plan.plan != __getobj__.plan + raise "invalid plan #{new_plan}" + elsif !new_plan.kind_of?(Roby::Transaction) + raise "trying to insert a transaction proxy in something else than a transaction (#{new_plan})" + end + end @plan = new_plan end lib/roby/transactions/proxy.rb 33e5a73500b7f01b1f9434fa4f0645340bbc64f3 Sylvain Joyeux sylvain.joyeux@m4x.org http://github.com/doudou/roby/commit/eecdf048a104ee030c312af9d753d4d079943c97 eecdf048a104ee030c312af9d753d4d079943c97 2008-06-01T05:35:20-07:00 2008-06-01T05:17:42-07:00 [core] fix Transaction::Proxy#plan= when the new plan is 'nil' 3e2aee2f64f4061f1d14b3fcc7389dcf23a64826 added a check in Transactions::Proxy, to be sure that the new plan is a transaction. However, it did not take into account the 'nil' case (which is fine). af4d2547c0264ee09e8ec3d4c84af26a146aa442 Sylvain Joyeux sylvain.joyeux@m4x.org