litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enabling connection testing with C3P0

Browse source
This commit is contained in:
brianjlowe 2012-08-31 15:14:04 +00:00
parent c0062ce189
commit 0a4262d876
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDBGraphGenerator.java
View file

@ -42,15 +42,15 @@ public class RDBGraphGenerator implements SQLGraphGenerator {
} }
public Graph generateGraph() { public Graph generateGraph() {
log.info("Regenerate the graph.");
try { try {
// if (log.isDebugEnabled()) { // if (log.isDebugEnabled()) {
// log.debug(ds.getNumActive() + " active SQL connections"); // log.debug(ds.getNumActive() + " active SQL connections");
// log.debug(ds.getNumIdle() + " idle SQL connections"); // log.debug(ds.getNumIdle() + " idle SQL connections");
// } // }
if ( ( this.connection == null ) || ( this.connection.isClosed() ) ) { if ( ( this.connection != null ) && ( !this.connection.isClosed() ) ) {
this.connection = ds.getConnection(); this.connection.close();
} }
this.connection = ds.getConnection();
IDBConnection idbConn = new DBConnection(this.connection, dbTypeStr); IDBConnection idbConn = new DBConnection(this.connection, dbTypeStr);
Graph requestedProperties = null; Graph requestedProperties = null;
boolean modelExists = idbConn.containsModel(graphID); boolean modelExists = idbConn.containsModel(graphID);

3
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
View file

@ -244,6 +244,9 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
cpds.setMaxIdleTimeExcessConnections(300); cpds.setMaxIdleTimeExcessConnections(300);
cpds.setAcquireIncrement(5); cpds.setAcquireIncrement(5);
cpds.setNumHelperThreads(6); cpds.setNumHelperThreads(6);
cpds.setTestConnectionOnCheckout(DEFAULT_TESTONBORROW);
cpds.setTestConnectionOnCheckin(DEFAULT_TESTONRETURN);
cpds.setPreferredTestQuery(getValidationQuery(ctx));
return cpds; return cpds;
} }