Align exceptions when invoking commands #119

Throw RedisException instead of future-transport on disconnected state when reconnect is disabled.
redis · Aug 19, 2015 · 40e7184 · 40e7184
1 parent c7999ea
commit 40e7184
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -178,9 +178,8 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
         }
 
         if ((channel == null || !isConnected()) && !clientOptions.isAutoReconnect()) {
-            command.completeExceptionally(new RedisException(
-                    "Connection is in a disconnected state and reconnect is disabled. Commands are not accepted."));
-            return command;
+            throw new RedisException(
+                    "Connection is in a disconnected state and reconnect is disabled. Commands are not accepted.");
         }
 
         try {

diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -124,7 +124,7 @@ public void disconnectedConnectionWithoutReconnect() throws Exception {
         connection.quit();
         Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
         try {
-            connection.get(key).get();
+            connection.get(key);
         } catch (Exception e) {
             assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining(
                     "Connection is in a disconnected state and reconnect is disabled");