Merge remote-tracking branch 'upstream/master'

This commit is contained in:
高铁
2016-06-25 15:59:18 +08:00
@@ -93,7 +93,7 @@ public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter i
validationQueryTimeout = DEFAULT_VALIDATION_QUERY_TIMEOUT;
}
ping.invoke(conn, true, validationQueryTimeout);
ping.invoke(conn, true, validationQueryTimeout * 1000);
return true;
}
}