fail in try block

elastic · Apr 15, 2019 · fb1f7eb · fb1f7eb
1 parent 667cfd8
commit fb1f7eb
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...st/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/...st/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java
@@ -836,20 +836,18 @@ protected void shardOperationOnPrimary(Request shardRequest, IndexShard primary,
 
         try {
             listener.get();
+            if (throwExceptionOnRun || respondWithError) {
+                fail("expected exception, but none was thrown");
+            }
         } catch (ExecutionException e) {
             if (throwExceptionOnRun || respondWithError) {
                 Throwable cause = e.getCause();
                 assertThat(cause, instanceOf(ElasticsearchException.class));
                 assertThat(cause.getMessage(), containsString("simulated"));
-                return;
             } else {
                 throw e;
             }
         }
-
-        if (throwExceptionOnRun || respondWithError) {
-            fail("expected exception, but none was thrown");
-        }
     }
 
     public void testReplicasCounter() {