[teiid-commits] teiid SVN: r3262 - in branches/7.4.x/client/src: test/java/org/teiid/jdbc and 1 other directory.

Author: shawkins Date: 2011-06-23 11:37:30 -0400 (Thu, 23 Jun 2011) New Revision: 3262 Modified: branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java Log: TEIID-1640 fix for client query timeout setting Modified: branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java =================================================================== --- branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-06-23 15:19:05 UTC (rev 3261) +++ branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-06-23 15:37:30 UTC (rev 3262) @@ -200,7 +200,7 @@ String queryTimeoutStr = this.execProps.getProperty(ExecutionProperties.QUERYTIMEOUT); if(queryTimeoutStr != null) { try { - this.queryTimeoutMS = Integer.parseInt(fetchSizeStr)*1000; + this.queryTimeoutMS = Integer.parseInt(queryTimeoutStr)*1000; } catch(Exception e) { // silently failover to default } Modified: branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java =================================================================== --- branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java 2011-06-23 15:19:05 UTC (rev 3261) +++ branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java 2011-06-23 15:37:30 UTC (rev 3262) @@ -136,4 +136,13 @@ Mockito.verify(dqp, Mockito.times(2)).cancelRequest(0); } + @Test public void testTimeoutProperty() throws Exception { + ConnectionImpl conn = Mockito.mock(ConnectionImpl.class); + Properties p = new Properties(); + p.setProperty(ExecutionProperties.QUERYTIMEOUT, "2"); + Mockito.stub(conn.getExecutionProperties()).toReturn(p); + StatementImpl statement = new StatementImpl(conn, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); + assertEquals(2, statement.getQueryTimeout()); + } + }