This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push: new 53c6db8 Revert dnsjava update from 3.3.1 to 2.1.9 53c6db8 is described below commit 53c6db8676b868db10d668e7ede2ef36cf8241b9 Author: pmouawad <p.moua...@ubik-ingenierie.com> AuthorDate: Sat Dec 12 19:08:55 2020 +0100 Revert dnsjava update from 3.3.1 to 2.1.9 --- gradle.properties | 2 +- src/dist/src/dist/expected_release_jars.csv | 2 +- .../java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java | 3 +-- xdocs/changes.xml | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index e93db59..c601d49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -77,7 +77,7 @@ commons-text.version=1.9 darklaf.version=2.5.3 darklaf.extensions.version=0.3.4 dec.version=0.1.2 -dnsjava.version=3.3.1 +dnsjava.version=2.1.9 equalsverifier.version=3.4.2 freemarker.version=2.3.30 ftplet-api.version=1.1.1 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index d24a37d..2ab8d24 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -28,7 +28,7 @@ 46070,darklaf-utils-2.5.3.jar 336171,darklaf-windows-2.5.3.jar 98115,dec-0.1.2.jar -429982,dnsjava-3.3.1.jar +320748,dnsjava-2.1.9.jar 13854,error_prone_annotations-2.4.0.jar 1702975,freemarker-2.3.30.jar 32359,geronimo-jms_1.1_spec-1.1.1.jar diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java index 087c83a..be4be22 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java @@ -20,7 +20,6 @@ package org.apache.jmeter.protocol.http.control; import java.io.Serializable; import java.net.InetAddress; import java.net.UnknownHostException; -import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; @@ -266,7 +265,7 @@ public class DNSCacheManager extends ConfigTestElement implements TestIterationL Lookup lookup = new Lookup(host, Type.A); lookup.setCache(lookupCache); if (timeoutMs > 0) { - resolver.setTimeout(Duration.ofMillis(timeoutMs)); + resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000); } lookup.setResolver(resolver); Record[] records = lookup.run(); diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 5716963..a044536 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -126,7 +126,6 @@ Summary <li>Updated junit to 4.13.1 (from 4.13)</li> <li>Updated ph-commons to 9.5.1 (from 9.4.1)</li> <li>Updated ph-css to 6.2.3 (from 6.2.1)</li> - <li>Updated dnsjava to 3.3.1 (from 2.1.9)</li> <li>Updated groovy to 3.0.7 (from 3.0.5)</li> </ul>