You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/28 13:08:14 UTC
[36/50] [abbrv] incubator-commonsrdf git commit: Merge branch
'master' into COMMONSRDF-46
Merge branch 'master' into COMMONSRDF-46
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/2d4b5d30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/2d4b5d30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/2d4b5d30
Branch: refs/heads/COMMONSRDF-7
Commit: 2d4b5d300c1f27f62b356e4ef2d6910b746549f2
Parents: fb80617 6aa5a5d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 28 11:34:20 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 28 11:34:20 2016 +0100
----------------------------------------------------------------------
RELEASE-NOTES.txt | 19 +++++++++++++++++++
pom.xml | 4 ++--
.../rdf/rdf4j/experimental/RDF4JParser.java | 2 +-
.../org/apache/commons/rdf/simple/GraphImpl.java | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2d4b5d30/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
----------------------------------------------------------------------
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
index 558108b,be37449..26b3647
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
@@@ -111,10 -111,10 +111,10 @@@ public class RDF4JParser extends Abstra
@Override
protected RDF4JParser prepareForParsing() throws IOException, IllegalStateException {
- RDF4JParser c = prepareForParsing();
+ RDF4JParser c = super.prepareForParsing();
- // Ensure we have an RDF4JFactory for conversion.
+ // Ensure we have an RDF4J for conversion.
// We'll make a new one if user has provided a non-RDF4J factory
- c.rdf4jTermFactory = (RDF4JFactory) getRdfTermFactory().filter(RDF4JFactory.class::isInstance)
+ c.rdf4jTermFactory = (RDF4J) getRdfTermFactory().filter(RDF4J.class::isInstance)
.orElseGet(c::createRDFTermFactory);
return c;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2d4b5d30/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
----------------------------------------------------------------------