[teiid-commits] teiid SVN: r3976 - branches/7.7.x/client/src/main/java/org/teiid/jdbc.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-04-05 14:55:12 -0400 (Thu, 05 Apr 2012)
New Revision: 3976

Modified:
   branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
Log:
TEIID-1980 resetting the timeout to the property setting

Modified: branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-04-05 18:31:17 UTC (rev 3975)
+++ branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-04-05 18:55:12 UTC (rev 3976)
@@ -188,7 +188,11 @@
                 // silently failover to default
             }
         }
-        String queryTimeoutStr = this.execProps.getProperty(ExecutionProperties.QUERYTIMEOUT);
+        setTimeoutFromProperties();
+    }
+
+	private void setTimeoutFromProperties() {
+		String queryTimeoutStr = this.execProps.getProperty(ExecutionProperties.QUERYTIMEOUT);
         if(queryTimeoutStr != null) {
             try {
                 this.queryTimeoutMS = Integer.parseInt(queryTimeoutStr)*1000;
@@ -196,7 +200,7 @@
                 // silently failover to default
             }
         }
-    }
+	}
 
     protected DQP getDQP() {
     	return this.driverConnection.getDQP();
@@ -861,6 +865,7 @@
         	cancel();        
             commandStatus = State.TIMED_OUT;
             queryTimeoutMS = NO_TIMEOUT;
+            setTimeoutFromProperties();
             currentRequestID = -1;
             if (this.resultSet != null) {
                 this.resultSet.close();