Skip to content

solve mysql invalid connection #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuGuangWang wants to merge 2 commits into from
Closed

solve mysql invalid connection #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f9d8a
solve mysql invalid connection
Jun 20, 2016
186183b
java 1.6 not support lambda expression
Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class PooledDataSource implements DataSource {
protected int poolTimeToWait = 20000;
protected String poolPingQuery = "NO PING QUERY SET";
protected boolean poolPingEnabled = false;
protected int poolPingConnectionsNotUsedFor = 0;
protected int poolPingConnectionsNotUsedFor = -1;

private int expectedConnectionTypeCode;

Expand Down Expand Up @@ -483,7 +483,7 @@ protected boolean pingConnection(PooledConnection conn) {

if (result) {
if (poolPingEnabled) {
if (poolPingConnectionsNotUsedFor >= 0 && conn.getTimeElapsedSinceLastUse() > poolPingConnectionsNotUsedFor) {
if (poolPingConnectionsNotUsedFor >= 0 && conn.getTimeElapsedSinceLastUse() >= poolPingConnectionsNotUsedFor) {
try {
if (log.isDebugEnabled()) {
log.debug("Testing connection " + conn.getRealHashCode() + " ...");
Expand Down
24 changes: 19 additions & 5 deletions src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@
*/
package org.apache.ibatis.jdbc;

import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import org.hsqldb.jdbc.JDBCConnection;
import org.junit.Test;

import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;

import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.hsqldb.jdbc.JDBCConnection;
import org.junit.Test;

public class PooledDataSourceTest extends BaseDataTest {

Expand Down Expand Up @@ -85,4 +87,16 @@ public void ShouldReturnRealConnection() throws Exception {
Connection c = ds.getConnection();
JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
}

@Test
public void pingConnection() throws Exception {
PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
ds.setPoolPingConnectionsNotUsedFor(0);
ds.setPoolPingEnabled(true);
ds.setPoolPingQuery("SELECT * FROM PRODUCT");
Connection c = ds.getConnection();
c.close();
}

}