Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9243F118C1 for ; Wed, 10 Sep 2014 09:38:53 +0000 (UTC) Received: (qmail 59019 invoked by uid 500); 10 Sep 2014 09:38:53 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 58932 invoked by uid 500); 10 Sep 2014 09:38:53 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 58874 invoked by uid 99); 10 Sep 2014 09:38:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2014 09:38:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AEB669C4D; Wed, 10 Sep 2014 09:38:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jakob@apache.org To: commits@marmotta.apache.org Date: Wed, 10 Sep 2014 09:38:59 -0000 Message-Id: <8bc5b1a03d7e413297d49fed748e0490@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/17] git commit: MARMOTTA-525: fix possible NPE when no Accept-Header is provided (default to */*) MARMOTTA-525: fix possible NPE when no Accept-Header is provided (default to */*) Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f995f4bb Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f995f4bb Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f995f4bb Branch: refs/heads/ldp Commit: f995f4bb3526c21c1f2297e65ca1ec6cc17ffd25 Parents: dd701b9 Author: Jakob Frank Authored: Wed Sep 3 15:08:21 2014 +0200 Committer: Jakob Frank Committed: Fri Sep 5 10:22:47 2014 +0200 ---------------------------------------------------------------------- .../marmotta/platform/ldp/webservices/LdpWebService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f995f4bb/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 5a32210..7a8e772 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 @@ -104,14 +104,18 @@ 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 = ldpService.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 = ldpService.getResourceUri(uriInfo); log.debug("HEAD to LDPR <{}>", resource); return buildGetResponse(resource, r, type).entity(null).build();