svn commit: r1409771 - in /jena/trunk: jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/ jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/

[an...@apache.org]

Author: andy
Date: Thu Nov 15 13:38:05 2012
New Revision: 1409771

URL: http://svn.apache.org/viewvc?rev=1409771&view=rev
Log:
Fixes for setting the context dataset in the presence of transactions.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java?rev=1409771&r1=1409770&r2=1409771&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java Thu Nov 15 13:38:05 2012
@@ -24,7 +24,6 @@ import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ReadWrite ;
 import com.hp.hpl.jena.shared.Lock ;
-import com.hp.hpl.jena.sparql.util.Context ;
 
 public abstract class DatasetGraphTrackActive implements DatasetGraph, Transactional
 {
@@ -170,9 +169,12 @@ public abstract class DatasetGraphTrackA
     public boolean contains(Node g, Node s, Node p, Node o)
     { return get().contains(g, s, p, o) ; }
 
-    @Override
-    public Context getContext()
-    { return get().getContext() ; }
+    // This mixes get() (which may do checking such as in/out transaction)
+    // with configuration, which is not transaction related.
+
+//    @Override
+//    public Context getContext()
+//    { return get().getContext() ; }
 
     @Override
     public long size()

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java?rev=1409771&r1=1409770&r2=1409771&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java Thu Nov 15 13:38:05 2012
@@ -24,6 +24,7 @@ import org.openjena.atlas.lib.Sync ;
 import com.hp.hpl.jena.query.ReadWrite ;
 import com.hp.hpl.jena.shared.JenaException ;
 import com.hp.hpl.jena.sparql.SystemARQ ;
+import com.hp.hpl.jena.sparql.util.Context ;
 
 /** A DatasetGraph that uses the dataset lock to give weak transactional behaviour.
  *  Only supports multiple-reader OR single-writer, and no transction abort.
@@ -114,6 +115,12 @@ public class DatasetGraphWithLock extend
     }
 
     @Override
+    public Context getContext()
+    {
+        return get().getContext() ;
+    }
+
+    @Override
     public void sync()
     {
         SystemARQ.sync(dsg) ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java?rev=1409771&r1=1409770&r2=1409771&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java Thu Nov 15 13:38:05 2012
@@ -25,6 +25,7 @@ import com.hp.hpl.jena.query.DatasetFact
 import com.hp.hpl.jena.query.ReadWrite ;
 import com.hp.hpl.jena.sparql.JenaTransactionException ;
 import com.hp.hpl.jena.sparql.core.DatasetGraphTrackActive ;
+import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
 import com.hp.hpl.jena.tdb.TDB ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
@@ -230,6 +231,13 @@ public class DatasetGraphTransaction ext
     {
         return DatasetFactory.create(getDatasetGraphToQuery()) ;
     }
+    
+    @Override
+    public Context getContext()
+    {
+        // Not the transactional dataset.
+        return getBaseDatasetGraph().getContext() ;
+    }
 
     @Override
     public void startRequest(UpdateRequest request)