Repository: marmotta Updated Branches: refs/heads/develop 8348d0dc5 -> 80e7eb6f3
MARMOTTA-562: avoiding later effect on other tests Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/80e7eb6f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/80e7eb6f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/80e7eb6f Branch: refs/heads/develop Commit: 80e7eb6f3523996c4681f7d1470ec4594912fb72 Parents: 8348d0d Author: Sergio Fernández <[email protected]> Authored: Wed Nov 5 17:31:12 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Wed Nov 5 17:31:12 2014 +0100 ---------------------------------------------------------------------- .../core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java | 2 +- .../org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/80e7eb6f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java index d7a4163..9d71d8b 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/HttpErrorExceptionMapper.java @@ -76,7 +76,7 @@ public class HttpErrorExceptionMapper implements CDIExceptionMapper<HttpErrorExc final String acceptHeader = exceptionHeaders.get("Accept"); final ContentType bestContentType = MarmottaHttpUtils.bestContentType(Arrays.asList(MarmottaHttpUtils.parseContentType("text/html"), MarmottaHttpUtils.parseContentType("application/json")), Arrays.asList(MarmottaHttpUtils.parseContentType(acceptHeader))); - htmlError = bestContentType.matches(MarmottaHttpUtils.parseContentType("text/html")); + htmlError = bestContentType == null || !bestContentType.matches(MarmottaHttpUtils.parseContentType("application/json")); } Response.ResponseBuilder responseBuilder; http://git-wip-us.apache.org/repos/asf/marmotta/blob/80e7eb6f/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java index 0e11f9c..ce50ab2 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java @@ -236,8 +236,6 @@ public class LinkedDataTest { .put(resource1.stringValue()); - - // now check in the Marmotta triple store if all triples are there RepositoryResult<Statement> statements = con.getStatements(resource1,null,null,true); while(statements.hasNext()) {
