jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1751550 - /jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Date Tue, 05 Jul 2016 20:14:03 GMT
Author: fschumacher
Date: Tue Jul  5 20:14:03 2016
New Revision: 1751550

URL: http://svn.apache.org/viewvc?rev=1751550&view=rev
Log:
Followup to r1751545. Explicitly unset validationQuery on BasicDataSource, when none is given
by the user.

Modified:
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java

Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java?rev=1751550&r1=1751549&r2=1751550&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
(original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Tue Jul  5 20:14:03 2016
@@ -211,7 +211,9 @@ public class DataSourceElement extends A
         if(isKeepAlive()) {
             dataSource.setTestWhileIdle(true);
             String validationQuery = getCheckQuery();
-            if (!StringUtils.isBlank(validationQuery)) {
+            if (StringUtils.isBlank(validationQuery)) {
+                dataSource.setValidationQuery(null);
+            } else {
                 dataSource.setValidationQuery(validationQuery);
             }
             dataSource.setSoftMinEvictableIdleTimeMillis(Long.parseLong(getConnectionAge()));



Mime
View raw message