Allow completion of multiple subsequent MULTI calls #673

redis · Jan 23, 2018 · c893778 · c893778
1 parent 2e59f1e
commit c893778
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java b/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,6 @@ private static boolean isTransactionActive(StatefulConnection<?, ?> connection)
     }
 
     private static boolean isNonTxControlMethod(String methodName) {
-        return !methodName.equals("exec") && !methodName.equals("multi");
+        return !methodName.equals("exec") && !methodName.equals("multi") && !methodName.equals("discard");
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -210,7 +210,7 @@ public <T, C extends RedisCommand<K, V, T>> C dispatch(C command) {
             local.setOutput((MultiOutput) multiOutput);
         }
 
-        if (multi != null) {
+        if (multi != null && !local.getType().name().equals(MULTI.name())) {
             local = new TransactionalCommand<>(local);
             multi.add(local);
         }

diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
  * @author Mark Paluch
  */
 public class TransactionCommandTest extends AbstractRedisClientTest {
+
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
@@ -109,4 +110,12 @@ public void execWithoutMulti() {
         redis.exec();
     }
 
+    @Test
+    public void multiCalledTwiceShouldFail() {
+        exception.expect(RedisCommandExecutionException.class);
+        exception.expectMessage("ERR MULTI calls can not be nested");
+
+        redis.multi();
+        redis.multi();
+    }
 }