You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/12/14 12:55:19 UTC

jena git commit: Revise comment about systemLock and exception message for forced abort.

Repository: jena
Updated Branches:
  refs/heads/master df17ca35b -> b95483226


Revise comment about systemLock and exception message for forced abort.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b9548322
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b9548322
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b9548322

Branch: refs/heads/master
Commit: b95483226ce40a4215b4804732eab6be95ee7a7c
Parents: df17ca3
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Dec 14 11:55:08 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Dec 14 11:55:08 2015 +0000

----------------------------------------------------------------------
 .../apache/jena/sparql/core/mem/DatasetGraphInMemory.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b9548322/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
index b46fef0..97ef58e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
@@ -55,9 +55,11 @@ public class DatasetGraphInMemory extends DatasetGraphTriplesQuads implements Tr
     private final Lock writeLock = new LockMRPlusSW();
 
     /**
-     * Transaction lifecycle operations must be atomi, especially begin and commit where
-     * the global state of the indexes is read or written one after another.
-     *  and because a thread that is committing alters the various indexes.
+     * Transaction lifecycle operations must be atomic, especially
+     * {@link Transactional#begin} and {@link Transactional#commit}.
+     * <p>
+     * There are changes to be made to several datastructures and this 
+     * insures that they are made consistently.
      */
     private final ReentrantLock systemLock = new ReentrantLock(true);
 
@@ -188,7 +190,7 @@ public class DatasetGraphInMemory extends DatasetGraphTriplesQuads implements Tr
     public void end() {
         if (isInTransaction()) {
             if (transactionType().equals(WRITE)) {
-                log.warn("end() called for WRITE transaction without commit or abort having been called causing a forced abort");
+                log.warn("end() called for WRITE transaction without commit or abort having been called. This causes a forced abort.");
                 // _abort does _end actions inside the lock. 
                 _abort() ;
             } else {