Fix | Changed property verification logic to throw error on invalid v…

…alue even if its not being used by driver | GitHub issue microsoft#525
cheenamalhotra · May 3, 2018 · d235018 · d235018
1 parent b60068c
commit d235018
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -1703,12 +1703,14 @@ else if (0 == requestedPacketSize)
 
             sPropKey = SQLServerDriverIntProperty.CANCEL_QUERY_TIMEOUT.toString();
             int cancelQueryTimeout = SQLServerDriverIntProperty.CANCEL_QUERY_TIMEOUT.getDefaultValue();
-            // use cancelQueryTimeout only if queryTimeout is set.  
-            if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0  && queryTimeoutSeconds > defaultQueryTimeout) {
+
+            if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
                     int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     if (n >= cancelQueryTimeout) {
-                        cancelQueryTimeoutSeconds = n;
+                    	// use cancelQueryTimeout only if queryTimeout is set.
+                    	if(queryTimeoutSeconds > defaultQueryTimeout)
+                        	cancelQueryTimeoutSeconds = n;
                     }
                     else {
                         MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidCancelQueryTimeout"));