You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2021/02/11 14:27:36 UTC
svn commit: r1886429 - in /jackrabbit/branches/2.14: ./
jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
Author: reschke
Date: Thu Feb 11 14:27:35 2021
New Revision: 1886429
URL: http://svn.apache.org/viewvc?rev=1886429&view=rev
Log:
JCR-4579: jackrabbit-data: allow to disable statement pooling through system property (merged 1878846 into 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1878846
Modified: jackrabbit/branches/2.14/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java?rev=1886429&r1=1886428&r2=1886429&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionFactory.java Thu Feb 11 14:27:35 2021
@@ -34,7 +34,6 @@ import org.apache.commons.dbcp.Delegatin
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.jackrabbit.core.config.DataSourceConfig;
import org.apache.jackrabbit.core.config.DataSourceConfig.DataSourceDefinition;
-import org.apache.jackrabbit.core.util.db.DataSourceWrapper;
import org.apache.jackrabbit.util.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,6 +48,11 @@ import org.slf4j.LoggerFactory;
*/
public final class ConnectionFactory {
+ /**
+ * System property to disable the pooling of PreparedStatements.
+ */
+ private static final String SYSTEM_PROPERTY_POOL_PREPARED_STATEMENTS = "org.apache.jackrabbit.core.util.db.driver.datasource.poolPreparedStatements";
+
private static final Logger log = LoggerFactory.getLogger(ConnectionFactory.class);
/**
@@ -350,7 +354,7 @@ public final class ConnectionFactory {
ds.setMaxIdle(GenericObjectPool.DEFAULT_MAX_IDLE + 10);
ds.setValidationQuery(guessValidationQuery(url));
ds.setAccessToUnderlyingConnectionAllowed(true);
- ds.setPoolPreparedStatements(true);
+ ds.setPoolPreparedStatements(Boolean.valueOf(System.getProperty(SYSTEM_PROPERTY_POOL_PREPARED_STATEMENTS, "true")));
ds.setMaxOpenPreparedStatements(-1); // unlimited
return ds;
}