Fix NPE in when command output is null #187

redis · Feb 4, 2016 · a1f66d9 · a1f66d9
1 parent 8d26271
commit a1f66d9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -91,6 +91,10 @@ public <T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             channelWriter = writer.defaultWriter;
         }
 
+        if(command.getOutput() != null){
+            commandToSend.getOutput().setError((String) null);
+        }
+
         if (channelWriter != null && channelWriter != this && channelWriter != defaultWriter) {
             return channelWriter.write(commandToSend);
         }

diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -207,6 +207,19 @@ public void pipelining() throws Exception {
         verificationConnection.close();
     }
 
+
+    @Test
+    public void transactions() throws Exception {
+
+        connection.multi();
+        connection.set(key, value);
+        connection.discard();
+
+        connection.multi();
+        connection.set(key, value);
+        connection.exec();
+    }
+
     protected String value(int i) {
         return value + "-" + i;
     }