You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/02 18:14:59 UTC
git commit: some more fixes for MARMOTTA-287
Updated Branches:
refs/heads/develop b82e9ecef -> a766304cc
some more fixes for MARMOTTA-287
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a766304c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a766304c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a766304c
Branch: refs/heads/develop
Commit: a766304cc24a67e27798a96226ed5f36331ef1ce
Parents: b82e9ec
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 2 18:15:00 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 2 18:15:00 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/model/rdf/KiWiTriple.java | 2 +-
.../kiwi/persistence/KiWiPersistence.java | 33 +++++++++++++-------
.../apache/marmotta/kiwi/sail/KiWiStore.java | 1 +
3 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a766304c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiTriple.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiTriple.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiTriple.java
index 369c408..4af2e42 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiTriple.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiTriple.java
@@ -262,7 +262,7 @@ public class KiWiTriple implements Statement, Serializable {
// if (!(o instanceof KiWiTriple)) return false;
- KiWiTriple triple = (KiWiTriple) o;
+ Statement triple = (Statement) o;
if (!getContext().equals(triple.getContext())) return false;
if (!getObject().equals(triple.getObject())) return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a766304c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
index 6a73579..ad91d3d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
@@ -246,8 +246,12 @@ public class KiWiPersistence {
}
public void logPoolInfo() throws SQLException {
- log.debug("num_busy_connections: {}", connectionPool.getNumActive());
- log.debug("num_idle_connections: {}", connectionPool.getNumIdle());
+ if(connectionPool != null) {
+ log.debug("num_busy_connections: {}", connectionPool.getNumActive());
+ log.debug("num_idle_connections: {}", connectionPool.getNumIdle());
+ } else {
+ log.debug("connection pool not initialized");
+ }
}
@@ -390,16 +394,23 @@ public class KiWiPersistence {
* @throws SQLException in case a new connection could not be established
*/
public KiWiConnection getConnection() throws SQLException {
- if(connectionPool != null) {
- KiWiConnection con = new KiWiConnection(this,configuration.getDialect(),cacheManager);
- if(getDialect().isBatchSupported()) {
- con.setBatchCommit(configuration.isBatchCommit());
- con.setBatchSize(configuration.getBatchSize());
- }
- return con;
- } else {
- throw new SQLException("connection pool is closed, database connections not available");
+ if(connectionPool == null) {
+ // init JDBC connection pool
+ initConnectionPool();
+
+ // init EHCache caches
+ initCachePool();
+
+ // init garbage collector thread
+ initGarbageCollector();
+ }
+
+ KiWiConnection con = new KiWiConnection(this,configuration.getDialect(),cacheManager);
+ if(getDialect().isBatchSupported()) {
+ con.setBatchCommit(configuration.isBatchCommit());
+ con.setBatchSize(configuration.getBatchSize());
}
+ return con;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a766304c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiStore.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiStore.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiStore.java
index 6cd43d8..d8e3349 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiStore.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiStore.java
@@ -173,6 +173,7 @@ public class KiWiStore extends NotifyingSailBase {
protected void shutDownInternal() throws SailException {
closeValueFactory();
persistence.shutdown();
+ initialized = false;
}
/**