← Back to branch summary

~maria-captains/mariadb-java-client/trunk

~maria-captains/mariadb-java-client/trunk

Viewing all changes in revision 536.2.1.

Committer: Massimo Siani
Date: 2014-12-04 11:40:18 UTC
mto: This revision was merged to the branch mainline in revision 542.
Revision ID: massimo.siani@skysql.com-20141204114018-v04q80xjxtln4y2s

Fix for CONJ-121: implement Connection.getNetworkTimeout and Connection.setNetworkTimeout

files added:
.java.policy

files modified:
src/main/java/org/mariadb/jdbc/MySQLConnection.java

src/main/java/org/mariadb/jdbc/internal/mysql/MySQLProtocol.java

src/test/java/org/mariadb/jdbc/ConnectionTest.java

Show diffs side-by-side

added added

removed removed

src/main/java/org/mariadb/jdbc/MySQLConnection.java

src/main/java/org/mariadb/jdbc/internal/mysql/MySQLProtocol.java

src/test/java/org/mariadb/jdbc/ConnectionTest.java

Older »