Merge pull request #814 from jamesrdf/issues/#774-sailsource-npe

James Leigh · web-flow · commit 58f8bee7b1af · 2017-05-24T11:07:28.000-04:00
Fix #774: Change all SailSourceModel fields to be synchronized
diff --git a/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/SailSourceModel.java b/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/SailSourceModel.java
@@ -239,7 +239,7 @@ public synchronized boolean add(Resource subj, IRI pred, Value obj, Resource...
 		if (subj == null || pred == null || obj == null)
 			throw new UnsupportedOperationException("Incomplete statement");
 		try {
-			if (contains(dataset, subj, pred, obj, contexts)) {
+			if (contains(subj, pred, obj, contexts)) {
 				logger.trace("already contains statement {} {} {} {}", subj, pred, obj, contexts);
 				return false;
 			}
@@ -383,7 +383,7 @@ public synchronized void removeTermIteration(Iterator<Statement> iter, Resource
 		}
 	}
 
-	private SailSink sink()
+	private synchronized SailSink sink()
 		throws SailException
 	{
 		if (sink == null) {
@@ -392,7 +392,7 @@ private SailSink sink()
 		return sink;
 	}
 
-	private SailDataset dataset()
+	private synchronized SailDataset dataset()
 		throws SailException
 	{
 		if (sink != null) {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public synchronized boolean add(Resource subj, IRI pred, Value obj, Resource...`
`239`	`239`	`if (subj == null \|\| pred == null \|\| obj == null)`
`240`	`240`	`throw new UnsupportedOperationException("Incomplete statement");`
`241`	`241`	`try {`
`242`		`- if (contains(dataset, subj, pred, obj, contexts)) {`
	`242`	`+ if (contains(subj, pred, obj, contexts)) {`
`243`	`243`	`logger.trace("already contains statement {} {} {} {}", subj, pred, obj, contexts);`
`244`	`244`	`return false;`
`245`	`245`	`}`
`@@ -383,7 +383,7 @@ public synchronized void removeTermIteration(Iterator<Statement> iter, Resource`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
`386`		`- private SailSink sink()`
	`386`	`+ private synchronized SailSink sink()`
`387`	`387`	`throws SailException`
`388`	`388`	`{`
`389`	`389`	`if (sink == null) {`
`@@ -392,7 +392,7 @@ private SailSink sink()`
`392`	`392`	`return sink;`
`393`	`393`	`}`
`394`	`394`
`395`		`- private SailDataset dataset()`
	`395`	`+ private synchronized SailDataset dataset()`
`396`	`396`	`throws SailException`
`397`	`397`	`{`
`398`	`398`	`if (sink != null) {`