Repository: marmotta Updated Branches: refs/heads/MARMOTTA-525 [created] e461f451d
MARMOTTA-525: Fixing possible NPE if Accept-Header is missing: default to */* Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bab0725b Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bab0725b Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bab0725b Branch: refs/heads/MARMOTTA-525 Commit: bab0725b2e7c95f3f6d2af9af5b32166e71131a4 Parents: 30ef267 Author: Jakob Frank <[email protected]> Authored: Tue Sep 2 16:00:06 2014 +0200 Committer: Jakob Frank <[email protected]> Committed: Tue Sep 2 16:00:06 2014 +0200 ---------------------------------------------------------------------- .../apache/marmotta/platform/ldp/webservices/LdpWebService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/bab0725b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java index 0a24fcf..bdeb54f 100644 --- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java +++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java @@ -84,14 +84,14 @@ public class LdpWebService { } @GET - public Response GET(@Context final UriInfo uriInfo, @Context Request r, @HeaderParam(HttpHeaders.ACCEPT) MediaType type) throws RepositoryException { + public Response GET(@Context final UriInfo uriInfo, @Context Request r, @HeaderParam(HttpHeaders.ACCEPT) @DefaultValue(MediaType.WILDCARD) MediaType type) throws RepositoryException { final String resource = getResourceUri(uriInfo); log.debug("GET to LDPR <{}>", resource); return buildGetResponse(resource, r, type).build(); } @HEAD - public Response HEAD(@Context final UriInfo uriInfo, @Context Request r, @HeaderParam(HttpHeaders.ACCEPT) MediaType type) throws RepositoryException { + public Response HEAD(@Context final UriInfo uriInfo, @Context Request r, @HeaderParam(HttpHeaders.ACCEPT) @DefaultValue(MediaType.WILDCARD) MediaType type) throws RepositoryException { final String resource = getResourceUri(uriInfo); log.debug("HEAD to LDPR <{}>", resource); return buildGetResponse(resource, r, type).entity(null).build();
