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/30 18:45:02 UTC
[25/50] [abbrv] git commit: fixes MARMOTTA-305 - was caused because
Context was not considered in ResourceUtils
fixes MARMOTTA-305 - was caused because Context was not considered in ResourceUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c262fbc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c262fbc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c262fbc6
Branch: refs/heads/master
Commit: c262fbc681b27ad4c3f5741185253864a8788a8e
Parents: 34a2c5c
Author: tkurz <tk...@apache.org>
Authored: Thu Sep 12 21:40:58 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu Sep 12 21:40:58 2013 +0200
----------------------------------------------------------------------
.../marmotta/commons/sesame/repository/ResourceUtils.java | 6 +++---
.../platform/core/webservices/resource/ResourceWebService.java | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c262fbc6/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 c70e27e..1484df2 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
@@ -143,7 +143,7 @@ public class ResourceUtils {
* @return true if the {@link Resource} is ever used as context.
*/
public static boolean isContext(RepositoryConnection conn, Resource rsc) {
- return existsStatement(conn, null, null, null);
+ return existsStatement(conn, null, null, null, rsc);
}
/**
@@ -175,9 +175,9 @@ public class ResourceUtils {
* @param object the object of the {@link org.openrdf.model.Statement} or <code>null</code> for a wildcard.
* @return true if a {@link Statement} with the provided constraints exists.
*/
- public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object) {
+ public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object, Resource ... context) {
try {
- return conn.hasStatement(subj,pred,object,true);
+ return conn.hasStatement(subj,pred,object,true,context);
} catch (RepositoryException e) {
log.error(e.getMessage());
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c262fbc6/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 facd716..f2e76eb 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
@@ -366,10 +366,12 @@ public class ResourceWebService {
RepositoryConnection conn = sesameService.getConnection();
try {
conn.begin();
- Resource r;
+ Resource r = null;
if (UriUtil.validate(resource)) {
try {
- r = ResourceUtils.getUriResource(conn, resource);
+ if(ResourceUtils.isSubject(conn, resource)) { //tests if a resource is used as subject
+ r = ResourceUtils.getUriResource(conn, resource);
+ }
} catch (Exception e) {
log.error("Error retrieving the resource <{}>: {}", resource, e.getMessage());
log.debug("So redirecting directly to it...");