JENA-1221: Merge commit 'refs/pull/162/head' of github.com:apache/jena
This closes #162.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
index 1af3f1a..91809af 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
@@ -39,9 +39,9 @@
/** Abort a transaction - finish the transaction and undo any changes (if a "write" transaction) */
public void abort() ;
- /** Say whether inside a transaction. */
- public boolean isInTransaction() ;
-
/** Finish the transaction - if a write transaction and commit() has not been called, then abort */
public void end() ;
+
+ /** Say whether inside a transaction. */
+ public boolean isInTransaction() ;
}
diff --git a/jena-arq/src/main/java/org/apache/jena/system/TxnCounter.java b/jena-arq/src/main/java/org/apache/jena/system/TxnCounter.java
index 1477e6b..4f5d554 100644
--- a/jena-arq/src/main/java/org/apache/jena/system/TxnCounter.java
+++ b/jena-arq/src/main/java/org/apache/jena/system/TxnCounter.java
@@ -61,7 +61,7 @@
}
// Global state - the exterally visible value and the starting point for any
- // transaction. This is set to a new value when a write trasnaction commits.
+ // transaction. This is set to a new value when a write transaction commits.
private final AtomicLong value = new AtomicLong(-1712) ;
