Don't allow null return from wrapper

elastic · Dec 1, 2016 · 65501a8 · 65501a8
1 parent 43bf7af
commit 65501a8
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/core/src/main/java/org/elasticsearch/rest/RestController.java b/core/src/main/java/org/elasticsearch/rest/RestController.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.rest;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
@@ -148,19 +149,19 @@ public void dispatchRequest(final RestRequest request, final RestChannel channel
                 }
             }
 
-            final RestHandler rawHandler = getHandler(request);
-            final RestHandler handler = handlerWrapper.apply(rawHandler);
+            final RestHandler handler = getHandler(request);
 
-            if (handler != null) {
-                handler.handleRequest(request, channel, client);
-            } else {
+            if (handler == null) {
                 if (request.method() == RestRequest.Method.OPTIONS) {
                     // when we have OPTIONS request, simply send OK by default (with the Access Control Origin header which gets automatically added)
                     channel.sendResponse(new BytesRestResponse(OK, BytesRestResponse.TEXT_CONTENT_TYPE, BytesArray.EMPTY));
                 } else {
                     final String msg = "No handler found for uri [" + request.uri() + "] and method [" + request.method() + "]";
                     channel.sendResponse(new BytesRestResponse(BAD_REQUEST, msg));
                 }
+            } else {
+                final RestHandler wrappedHandler = Objects.requireNonNull(handlerWrapper.apply(handler));
+                wrappedHandler.handleRequest(request, channel, client);
             }
         }
     }