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 B5808E5C5 for ; Thu, 7 Mar 2013 14:04:44 +0000 (UTC) Received: (qmail 85829 invoked by uid 500); 7 Mar 2013 14:04:44 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 85745 invoked by uid 500); 7 Mar 2013 14:04:44 -0000 Mailing-List: contact commits-help@marmotta.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.incubator.apache.org Delivered-To: mailing list commits@marmotta.incubator.apache.org Received: (qmail 85710 invoked by uid 99); 7 Mar 2013 14:04:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 14:04:43 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 07 Mar 2013 14:04:40 +0000 Received: (qmail 80800 invoked by uid 99); 7 Mar 2013 14:04:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 14:04:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4737583145D; Thu, 7 Mar 2013 14:04:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: wikier@apache.org To: commits@marmotta.incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: fixed rendering of raw resources that cannot be managed by the cache Message-Id: <20130307140417.4737583145D@tyr.zones.apache.org> Date: Thu, 7 Mar 2013 14:04:17 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org fixed rendering of raw resources that cannot be managed by the cache Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/19aceff8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/19aceff8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/19aceff8 Branch: refs/heads/master Commit: 19aceff8f65396b105f42bb7efe72e250dc3041f Parents: 5cd35c9 Author: Sergio Fernández Authored: Thu Mar 7 15:01:12 2013 +0100 Committer: Sergio Fernández Committed: Thu Mar 7 15:01:12 2013 +0100 ---------------------------------------------------------------------- .../webservices/resource/ResourceWebService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/19aceff8/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java index 4452e31..a770513 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java @@ -346,7 +346,14 @@ public class ResourceWebService { RepositoryConnection conn = sesameService.getConnection(); try { conn.begin(); - URI resource = ResourceUtils.getUriResource(conn, uri); + URI resource; + try { + resource = ResourceUtils.getUriResource(conn, uri); + } catch (Exception e) { + log.error("Error retrieving the URI <{}>: {}", uri, e.getMessage()); + log.debug("So redirecting directly to it..."); + return Response.seeOther(new java.net.URI(uri)).build(); + } if (resource == null) return ResourceWebServiceHelper.buildErrorPage(uri, configurationService.getBaseUri(), Response.Status.NOT_FOUND, "the requested resource could not be found in LMF right now, but may be available again in the future"); // FIXME String appendix = uuid == null ? "?uri=" + URLEncoder.encode(uri, "utf-8") : // "/" + uuid;