You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/10 12:15:55 UTC
git commit: fixed some further wrong usages of hasStatement and
getStatements
Updated Branches:
refs/heads/develop ce5cf2c5d -> d74b7a77e
fixed some further wrong usages of hasStatement and getStatements
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d74b7a77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d74b7a77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d74b7a77
Branch: refs/heads/develop
Commit: d74b7a77e6ee2317dfcd689cdb5bc84892111a1d
Parents: ce5cf2c
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 10 12:15:49 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 10 12:15:49 2013 +0200
----------------------------------------------------------------------
.../commons/sesame/repository/ResourceUtils.java | 6 +++++-
.../commons/sesame/facading/impl/FacadingImpl.java | 12 ++++++++++--
.../facading/concurrent/ConcurrentFacadingTest.java | 5 ++++-
.../core/webservices/resource/InspectionWebService.java | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
index 95cc9a4..c70e27e 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
@@ -1233,7 +1233,11 @@ public class ResourceUtils {
URI rdf_type = con.getValueFactory().createURI(Namespaces.NS_RDF + "type");
if(rdf_type != null) {
- return con.hasStatement(r,rdf_type,type,true,context);
+ if(context != null) {
+ return con.hasStatement(r,rdf_type,type,true,context);
+ } else {
+ return con.hasStatement(r,rdf_type,type,true);
+ }
}
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
index 4976592..be43a64 100644
--- a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
+++ b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
@@ -261,13 +261,21 @@ public class FacadingImpl implements Facading {
String[] rdfTypes = FacadeUtils.getFacadeAnnotation(type, RDFType.class).value();
boolean facadeable = true;
for (String s_type : rdfTypes) {
- facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ if(context != null) {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ } else {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true);
+ }
}
// also check for @RDFFilter
if (FacadeUtils.isFacadeAnnotationPresent(type, RDFFilter.class)) {
String[] filterTypes = FacadeUtils.getFacadeAnnotation(type, RDFFilter.class).value();
for (String s_type : filterTypes) {
- facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ if(context != null) {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ } else {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true);
+ }
}
}
return facadeable;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
index bd9edd6..32ce2a0 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
@@ -99,8 +99,11 @@ public class ConcurrentFacadingTest extends AbstractFacadingTest {
}
}
+ /**
+ * Test for MARMOTTA-236
+ * @throws RepositoryException
+ */
@Test
- @Ignore("Not a proper solution yet")
public void testParallelFacadingType() throws RepositoryException {
final RepositoryConnection mainCon = repositoryRDF.getConnection();
try {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
index 56a0c98..e80a8c3 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
@@ -174,7 +174,7 @@ public class InspectionWebService {
private List<TriplePoJo> buildResultList(RepositoryConnection conn, URI s, URI p, URI o, URI c, long start, int limit) throws RepositoryException {
List<TriplePoJo> result = new ArrayList<InspectionWebService.TriplePoJo>();
- RepositoryResult<Statement> triples = conn.getStatements(s,p,o,true,c);
+ RepositoryResult<Statement> triples = c != null ? conn.getStatements(s,p,o,true,c) : conn.getStatements(s,p,o,true);
// skip until start
for(int i = 0; i<start && triples.hasNext(); i++) {
triples.next();