From df1dfce3271f2c44c24edb5850a2868a91260ef7 Mon Sep 17 00:00:00 2001
From: Ivo Ramirez <cadillactravolta@gmail.com>
Date: Thu, 15 Dec 2011 18:44:44 +0100
Subject: [PATCH] SCRIPT KILL command fixed

---
 src/main/java/redis/clients/jedis/BinaryJedis.java       | 3 ++-
 .../jedis/tests/commands/ScriptingCommandsTest.java      | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index 20fd083..f0b9d73 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -3047,7 +3047,8 @@ public class BinaryJedis implements BinaryJedisCommands {
     	return client.getBinaryBulkReply();
     }
     
-    public void scriptKill(){
+    public byte[] scriptKill(){
     	client.scriptKill();
+    	return client.getBinaryBulkReply();
     }
 }
diff --git a/src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
index 07b0059..78825a9 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
@@ -120,6 +120,11 @@ public class ScriptingCommandsTest extends JedisCommandTestBase {
 	@SuppressWarnings("unchecked")
 	@Test
     public void scriptKill() {
-		jedis.scriptKill();
-    }
+		try {
+			jedis.scriptKill();
+		}
+		catch(JedisDataException e) {
+			assertEquals("ERR No scripts in execution right now.", e.getMessage());
+		}
+	}
 }
\ No newline at end of file