svn commit: r1499693 - in /jena/trunk: jena-arq/src/main/java/arq/cmdline/CmdUpdate.java jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java

[andy]

Author: andy
Date: Thu Jul  4 09:05:13 2013
New Revision: 1499693

URL: http://svn.apache.org/r1499693
Log:
Clean comments and unused code.

Modified:
    jena/trunk/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
    
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java

Modified: jena/trunk/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java?rev=1499693&r1=1499692&r2=1499693&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java Thu Jul  4 
09:05:13 2013
@@ -49,15 +49,12 @@ public abstract class CmdUpdate extends 
             updateSyntax = Syntax.syntaxSPARQL_11 ;
     }
     
-    
     @Override
     protected final void exec()
     {
         GraphStore graphStore = modGraphStore.getGraphStore() ;
         if ( graphStore.getDefaultGraph() == null )
             
graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()); 
-        // Migrate trasnaction flag to DatsetGraph ... sometime 
-        
         execUpdate(graphStore) ;
     }
 

Modified: 
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java?rev=1499693&r1=1499692&r2=1499693&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java 
(original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java 
Thu Jul  4 09:05:13 2013
@@ -235,17 +235,17 @@ public class StoreConnection
         if (sConn == null)
         {
             sConn = new StoreConnection(dsg) ;
-            boolean actionTaken = 
JournalControl.recoverFromJournal(dsg.getConfig(), 
sConn.transactionManager.getJournal()) ;
-            
-            if ( false && actionTaken )
-            {
-                // This should be unnecessary because we wrote the journal 
replay
-                // via the DSG storage configuration.  
-                sConn.transactionManager.closedown() ;
-                sConn.baseDSG.close() ;
-                dsg = DatasetBuilderStd.build(location) ;
-                sConn = new StoreConnection(dsg) ;
-            }
+            sConn.forceRecoverFromJournal() ;
+//            boolean actionTaken = 
JournalControl.recoverFromJournal(dsg.getConfig(), 
sConn.transactionManager.getJournal()) ;
+//            if ( false && actionTaken )
+//            {
+//                // This should be unnecessary because we wrote the journal 
replay
+//                // via the DSG storage configuration.  
+//                sConn.transactionManager.closedown() ;
+//                sConn.baseDSG.close() ;
+//                dsg = DatasetBuilderStd.build(location) ;
+//                sConn = new StoreConnection(dsg) ;
+//            }
             
             if (!location.isMemUnique())
                 // Don't cache use-once in-memory datasets.

Modified: 
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java?rev=1499693&r1=1499692&r2=1499693&view=diff
==============================================================================
--- 
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
 (original)
+++ 
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
 Thu Jul  4 09:05:13 2013
@@ -45,9 +45,6 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 public class DatasetBuilderTxn
 {
     // Ideally, don't make a DatasetGraphTDB to pass to new DatasetGraphTxn as 
it rips it apart.
-    // And fails to copy context.
-    // XXX 1/ DatasetGraphTDB clone constructor needs to handle context. 
-    // XXX 2/ DatasetBuilderTxn needs to build a  DatasetGraphTxn directly, 
not via 
     
     // Context for the build.
     private TransactionManager txnMgr ;