You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ki...@apache.org on 2018/08/11 21:57:07 UTC
[1/2] jena git commit: JENA-1591: use boolean value in if expression
Repository: jena
Updated Branches:
refs/heads/master 0216a8cf5 -> 85a5a3b4e
JENA-1591: use boolean value in if expression
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c29aefa8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c29aefa8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c29aefa8
Branch: refs/heads/master
Commit: c29aefa8d0a8fbf7cda1c8c973a779b9cfb30445
Parents: 0216a8c
Author: Bruno P. Kinoshita <ki...@apache.org>
Authored: Sun Aug 12 00:59:46 2018 +1200
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Sun Aug 12 09:55:48 2018 +1200
----------------------------------------------------------------------
.../apache/jena/dboe/transaction/txn/TransactionCoordinator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c29aefa8/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
index 7ee778b..0e92005 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
@@ -757,8 +757,8 @@ public class TransactionCoordinator {
private void finishActiveTransaction(Transaction transaction) {
synchronized(coordinatorLock) {
// Idempotent.
- Object x = activeTransactions.remove(transaction) ;
- if ( x == null )
+ boolean x = activeTransactions.remove(transaction) ;
+ if ( ! x )
return ;
countFinished.incrementAndGet() ;
activeTransactionCount.decrementAndGet() ;
[2/2] jena git commit: Merge branch 'JENA-1591'
Posted by ki...@apache.org.
Merge branch 'JENA-1591'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/85a5a3b4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/85a5a3b4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/85a5a3b4
Branch: refs/heads/master
Commit: 85a5a3b4e97174e255624eed441e824d87c8304c
Parents: 0216a8c c29aefa
Author: Bruno P. Kinoshita <ki...@apache.org>
Authored: Sun Aug 12 09:56:48 2018 +1200
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Sun Aug 12 09:56:48 2018 +1200
----------------------------------------------------------------------
.../apache/jena/dboe/transaction/txn/TransactionCoordinator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------