From 5e083026af972a23a5e554e50601a053821e57ad Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rubensm@dacya.ucm.es>
Date: Mon, 19 Jul 2010 18:53:20 +0200
Subject: [PATCH] Bug #260 wrong delete_at method, removed kill!

---
 src/mad/ruby/ActionManager.rb    | 2 +-
 src/mad/ruby/OpenNebulaDriver.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mad/ruby/ActionManager.rb b/src/mad/ruby/ActionManager.rb
index 622734061a..19b9e7981a 100644
--- a/src/mad/ruby/ActionManager.rb
+++ b/src/mad/ruby/ActionManager.rb
@@ -151,7 +151,7 @@ class ActionManager
                 @threads_cond.signal
             else
                 i = @action_queue.select{|x| x[:id] == action_id}.first
-                @action_queue.delete_at(i) if i
+                @action_queue.delete(i) if i
             end
         }
     end
diff --git a/src/mad/ruby/OpenNebulaDriver.rb b/src/mad/ruby/OpenNebulaDriver.rb
index b45c069d55..675348055c 100644
--- a/src/mad/ruby/OpenNebulaDriver.rb
+++ b/src/mad/ruby/OpenNebulaDriver.rb
@@ -71,7 +71,7 @@ class OpenNebulaDriver < ActionManager
     def start_driver
         loop_thread = Thread.new { loop }
         start_listener
-        loop_thread.kill!
+        loop_thread.kill
     end
 
 private