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/05 17:33:03 UTC
[1/2] jena git commit: Using ThreadLocal::remove to clean
thread-specific state
Repository: jena
Updated Branches:
refs/heads/master 10648973b -> a2ada95a7
Using ThreadLocal::remove to clean thread-specific state
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3bdb6181
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3bdb6181
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3bdb6181
Branch: refs/heads/master
Commit: 3bdb61814e27714dd1736f52bc03355354a29ed8
Parents: 83cf64d
Author: ajs6f <aj...@virginia.edu>
Authored: Fri Dec 4 12:00:38 2015 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Fri Dec 4 12:00:38 2015 -0500
----------------------------------------------------------------------
.../jena/sparql/core/mem/DatasetGraphInMemory.java | 14 +++++++-------
.../org/apache/jena/sparql/core/mem/HexTable.java | 2 +-
.../apache/jena/sparql/core/mem/PMapTupleTable.java | 2 +-
.../org/apache/jena/sparql/core/mem/TriTable.java | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3bdb6181/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 150bf24..92c79e9 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
@@ -166,13 +166,13 @@ public class DatasetGraphInMemory extends DatasetGraphTriplesQuads implements Tr
@Override
public void end() {
- if ( !isInTransaction() )
- return ;
- quadsIndex().end();
- defaultGraph().end();
- isInTransaction(false);
- transactionType(null);
- getLock().leaveCriticalSection();
+ if (isInTransaction()) {
+ quadsIndex().end();
+ defaultGraph().end();
+ isInTransaction.remove();
+ transactionType.remove();
+ getLock().leaveCriticalSection();
+ }
}
private <T> Iterator<T> access(final Supplier<Iterator<T>> source) {
http://git-wip-us.apache.org/repos/asf/jena/blob/3bdb6181/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/HexTable.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/HexTable.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/HexTable.java
index a968a54..b532c72 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/HexTable.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/HexTable.java
@@ -109,7 +109,7 @@ public class HexTable implements QuadTable {
@Override
public void end() {
indexBlock().values().forEach(QuadTable::end);
- isInTransaction(false);
+ isInTransaction.remove();
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/3bdb6181/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
index db7b988..b2ed80d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
@@ -100,7 +100,7 @@ public abstract class PMapTupleTable<TupleMapType, TupleType> implements TupleTa
public void end() {
debug("Abandoning transactional reference.");
local.remove();
- isInTransaction(false);
+ isInTransaction.remove();
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/3bdb6181/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TriTable.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TriTable.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TriTable.java
index f283d9d..9bd4ac9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TriTable.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TriTable.java
@@ -77,7 +77,7 @@ public class TriTable implements TripleTable {
@Override
public void end() {
indexBlock().values().forEach(TripleTable::end);
- isInTransaction(false);
+ isInTransaction.remove();
}
@Override
[2/2] jena git commit: Merge commit 'refs/pull/104/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/104/head' of github.com:apache/jena
This closes #104.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a2ada95a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a2ada95a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a2ada95a
Branch: refs/heads/master
Commit: a2ada95a7e1f5f10cc8cc9978c001b0c1ea5b41a
Parents: 1064897 3bdb618
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Dec 5 16:32:02 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Dec 5 16:32:02 2015 +0000
----------------------------------------------------------------------
.../jena/sparql/core/mem/DatasetGraphInMemory.java | 14 +++++++-------
.../org/apache/jena/sparql/core/mem/HexTable.java | 2 +-
.../apache/jena/sparql/core/mem/PMapTupleTable.java | 2 +-
.../org/apache/jena/sparql/core/mem/TriTable.java | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------