fix getHeaders npe

corbel-platform · Mar 8, 2019 · 4b5ef49 · 4b5ef49
1 parent 9eb2834
commit 4b5ef49
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/restor/src/main/java/io/corbel/resources/rem/restor/RestorGetRem.java b/restor/src/main/java/io/corbel/resources/rem/restor/RestorGetRem.java
@@ -25,15 +25,20 @@ public RestorGetRem(RestorDao dao) {
 
     @Override
     public Response resource(String collection, ResourceId resource, RequestParameters<ResourceParameters> parameters,
-            Optional<InputStream> entity) {
+                             Optional<InputStream> entity) {
 
         RestorResourceUri resourceUri = new RestorResourceUri(parameters.getRequestedDomain(), getMediaType(parameters), collection,
                 resource.getId());
 
         RestorObject object = dao.getObject(resourceUri);
         if (object != null) {
-            return Response.ok().type(object.getMediaType().toString()).entity(object.getInputStream())
-                    .header(HttpHeaders.CONTENT_LENGTH, object.getContentLength()).header(HttpHeaders.ETAG, object.getEtag()).header(HttpHeaders.CONTENT_DISPOSITION, parameters.getHeaders().getFirst(HttpHeaders.CONTENT_DISPOSITION)).build();
+            Response.ResponseBuilder responseBuilder = Response.ok().type(object.getMediaType().toString()).entity(object.getInputStream());
+            responseBuilder = responseBuilder.header(HttpHeaders.CONTENT_LENGTH, object.getContentLength());
+            responseBuilder = responseBuilder.header(HttpHeaders.ETAG, object.getEtag());
+            if (parameters.getHeaders() != null) {
+                responseBuilder = responseBuilder.header(HttpHeaders.CONTENT_DISPOSITION, parameters.getHeaders().getFirst(HttpHeaders.CONTENT_DISPOSITION));
+            }
+            return responseBuilder.build();
         }
         return ErrorResponseFactory.getInstance().notFound();
     }