Author: jgbutler Date: Sat Aug 19 10:55:36 2006 New Revision: 432851 URL: http://svn.apache.org/viewvc?rev=432851&view=rev Log: Fix for IBATIS-335 - Don't call setQueryTimeout if no value specified
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=432851&r1=432850&r2=432851&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original) +++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Sat Aug 19 10:55:36 2006 @@ -2,6 +2,11 @@ Build Number: @buildNum@ ------------------------------ + 2.2.1 - ??? +------------------------------ + o Fixed IBATIS-335 - Don't call setQueryTimeout if no value specified + +------------------------------ 2.2.0 - Aug 15, 2006 ------------------------------ Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java?rev=432851&r1=432850&r2=432851&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java Sat Aug 19 10:55:36 2006 @@ -487,8 +487,6 @@ private static void setStatementTimeout(MappedStatement mappedStatement, Statement statement) throws SQLException { if (mappedStatement.getTimeout() != null) { statement.setQueryTimeout(mappedStatement.getTimeout().intValue()); - } else { - statement.setQueryTimeout(0); // no timeout } }