Percolate / Analyzer API can hang if it fails to execute, closes elas…

…tic#1457.
dadoonet · Nov 13, 2011 · a56947b · a56947b
1 parent 86d552d
commit a56947b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.../org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java b/.../org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java
@@ -142,6 +142,7 @@ private void performFirst() {
                                         Response response = shardOperation(request, shard.id());
                                         listener.onResponse(response);
                                     } catch (Exception e) {
+                                        shardsIt.reset();
                                         onFailure(shard, e);
                                     }
                                 }
@@ -153,6 +154,7 @@ private void performFirst() {
                                 listener.onResponse(response);
                                 return;
                             } catch (Exception e) {
+                                shardsIt.reset();
                                 onFailure(shard, e);
                             }
                         }
@@ -204,6 +206,8 @@ private void perform(final Exception lastException) {
                                 onFailure(shard, e);
                             }
                         }
+                    } else {
+                        perform(lastException);
                     }
                 } else {
                     DiscoveryNode node = nodes.get(shard.currentNodeId());