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 2016/02/07 18:29:44 UTC
[2/3] jena git commit: Tidy up.
Tidy up.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0fb37093
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0fb37093
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0fb37093
Branch: refs/heads/master
Commit: 0fb37093115d092e1f4428c583042ccb8cb59d4d
Parents: 9f4e2dd
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 6 21:37:43 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 6 21:37:43 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/transaction/TS_Transaction.java | 4 ++--
.../apache/jena/sparql/transaction/TestTransactionSupport.java | 3 ---
.../main/java/org/apache/jena/fuseki/servlets/HttpAction.java | 6 +++---
3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb37093/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TS_Transaction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TS_Transaction.java b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TS_Transaction.java
index cb8689f..7fbbe62 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TS_Transaction.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TS_Transaction.java
@@ -24,9 +24,9 @@ import org.junit.runners.Suite.SuiteClasses ;
@RunWith(Suite.class)
@SuiteClasses( {
- TestTransactionDSGWithLockNoAbort.class,
- TestTransactionDSGWithLockWithAbort.class,
TestTransactionSupport.class
+ , TestTransactionDSGWithLockNoAbort.class
+ , TestTransactionDSGWithLockWithAbort.class
})
public class TS_Transaction
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb37093/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionSupport.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionSupport.java b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionSupport.java
index b849144..4eb1cac 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionSupport.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionSupport.java
@@ -32,9 +32,6 @@ import org.junit.runners.Parameterized ;
import org.junit.runners.Parameterized.Parameters ;
/** "supports" for various DatasetGraph implementations */
-
-//Paramterize?
-
@RunWith(Parameterized.class)
public class TestTransactionSupport {
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb37093/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
index 4708def..33a77ed 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
@@ -39,7 +39,7 @@ import org.apache.jena.sparql.SystemARQ ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphWrapper ;
import org.apache.jena.sparql.core.Transactional ;
-import org.apache.jena.sparql.core.TransactionalMutex ;
+import org.apache.jena.sparql.core.TransactionalLock ;
import org.slf4j.Logger ;
/**
@@ -169,8 +169,8 @@ public class HttpAction
transactional = dsg ;
isTransactional = false ;
} else {
- // Nothing to build on. Be safe.
- transactional = new TransactionalMutex(dsg.getLock()) ;
+ // Nothing to build on. Be safe.
+ transactional = TransactionalLock.createMutex() ;
isTransactional = false ;
}
}