You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/03/23 07:39:02 UTC
[2/2] clerezza git commit: CLEREZZA-976: ported TDB storage provider
and some related fixes, a all tests pass
CLEREZZA-976: ported TDB storage provider and some related fixes,a all tests pass
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/4ccf4ecb
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/4ccf4ecb
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/4ccf4ecb
Branch: refs/heads/rdf-commons
Commit: 4ccf4ecb2402b69523d1943287ac10ed52b90a35
Parents: c4d5d3d
Author: Reto Gmuer <re...@apache.org>
Authored: Mon Mar 23 06:38:46 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Mon Mar 23 06:38:46 2015 +0000
----------------------------------------------------------------------
.../org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java | 6 +++---
.../rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java | 4 ++--
.../rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/4ccf4ecb/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
index 6465d86..7ea89eb 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
@@ -75,7 +75,7 @@ public class ModelGraph {
return new SimpleImmutableGraph(this,true);
}
};
- graph = new PrivilegedGraphWrapper(jenaAdapter).getImmutableGraph();
+ graph = new PrivilegedGraphWrapper(jenaAdapter);
} else { //construct an Graph
jenaAdapter = new JenaGraphAdaptor(model.getGraph(), lock);
this.graph = new PrivilegedGraphWrapper(jenaAdapter);
@@ -104,7 +104,7 @@ public class ModelGraph {
if(!readWrite){
throw new IllegalStateException("Unable to return Graph for read-only models");
}
- return (Graph)graph;
+ return graph;
}
/**
* Getter for the {@link ImmutableGraph}
@@ -116,7 +116,7 @@ public class ModelGraph {
if(readWrite){
throw new IllegalStateException("Unable to return ImmutableGraph for read/write models.");
}
- return (ImmutableGraph)graph;
+ return graph.getImmutableGraph();
}
/**
* closes this ModelGraph and frees up all Jena TDB related resources.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/4ccf4ecb/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
index 8a9d1aa..d18b20b 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
@@ -448,9 +448,9 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
datasetLock.readLock().lock();
try {
if(isExistingGraphName(name, Symbols.ImmutableGraph) || name.equals(defaultGraphName)){
- return getMGraph(name);
- } else if(isExistingGraphName(name, Symbols.Graph)){
return getImmutableGraph(name);
+ } else if(isExistingGraphName(name, Symbols.Graph)){
+ return getMGraph(name);
} else {
throw new NoSuchEntityException(name);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/4ccf4ecb/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
index 8dd2048..2d3fe66 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
@@ -84,7 +84,7 @@ public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
@Test(expected=NoSuchEntityException.class)
public void testUnionMgraph(){
TcProvider provider = getInstance();
- provider.getGraph(UNION_GRAPH_NAME);
+ provider.getMGraph(UNION_GRAPH_NAME);
}
/**