Returning 404 instead of NPE when type is not present.

Graylog2 · Jun 12, 2015 · 8ac5a12 · 8ac5a12
1 parent f21c41e
commit 8ac5a12
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/controllers/api/OutputsApiController.java b/app/controllers/api/OutputsApiController.java
@@ -37,8 +37,13 @@ public Result index() throws APIException, IOException {
     }
 
     public Result available(String outputType) throws APIException, IOException {
-        final AvailableOutputSummary result = outputService.available().types.get(outputType);
-        return ok(Json.toJson(result));
+        final Map<String, AvailableOutputSummary> types = outputService.available().types;
+        final AvailableOutputSummary result = types.get(outputType);
+        if (result != null) {
+            return ok(Json.toJson(result));
+        } else {
+            return notFound();
+        }
     }
 
     public Result availableTypes() throws APIException, IOException {