Deriving the REST status code from a failure can, very rarely, cause …

…an infinite loop

fixes elastic#2402

src/main/java/org/elasticsearch/ElasticSearchException.java

@@ -23,8 +23,6 @@
 
 /**
  * A base class for all elasticsearch exceptions.
- *
- *
  */
 public class ElasticSearchException extends RuntimeException {
 
@@ -52,21 +50,15 @@ public ElasticSearchException(String msg, Throwable cause) {
      * Returns the rest status code associated with this exception.
      */
     public RestStatus status() {
-        ElasticSearchException current = this;
-        while (current instanceof ElasticSearchWrapperException) {
-            if (getCause() == null) {
-                break;
-            }
-            if (getCause() instanceof ElasticSearchException) {
-                current = (ElasticSearchException) getCause();
-            } else {
-                break;
-            }
-        }
-        if (current == this) {
+        Throwable cause = unwrapCause();
+        if (cause == this) {
             return RestStatus.INTERNAL_SERVER_ERROR;
+        } else if (cause instanceof ElasticSearchException) {
+            return ((ElasticSearchException) cause).status();
+        } else if (cause instanceof IllegalArgumentException) {
+            return RestStatus.BAD_REQUEST;
         } else {
-            return current.status();
+            return RestStatus.INTERNAL_SERVER_ERROR;
         }
     }