You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2020/12/12 16:46:34 UTC
[jmeter] branch master updated: Updated dnsjava to 3.3.1 (from
2.1.9)
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 e54190b Updated dnsjava to 3.3.1 (from 2.1.9)
e54190b is described below
commit e54190b6809ec9779c9f7b5919bec6d99e3a5a07
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sat Dec 12 17:46:14 2020 +0100
Updated dnsjava to 3.3.1 (from 2.1.9)
---
checksum.xml | 1 +
gradle.properties | 2 +-
.../java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java | 3 ++-
xdocs/changes.xml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 1ff8af1..556ea1c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -67,6 +67,7 @@
<trusted-key id='7a8860944fad5f62' group='commons-net' />
<trusted-key id='86fdc7e2a11262cb' group='commons-net' />
<trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
+ <trusted-key id='a5c8dbb8a1599bd4' group='dnsjava' />
<trusted-key id='379ce192d401ab61' group='info.picocli' />
<trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
<trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
diff --git a/gradle.properties b/gradle.properties
index fb1b2f0..b5b1331 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=2.1.9
+dnsjava.version=3.3.1
equalsverifier.version=3.4.2
freemarker.version=2.3.30
ftplet-api.version=1.1.1
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 be4be22..087c83a 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,6 +20,7 @@ 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;
@@ -265,7 +266,7 @@ public class DNSCacheManager extends ConfigTestElement implements TestIterationL
Lookup lookup = new Lookup(host, Type.A);
lookup.setCache(lookupCache);
if (timeoutMs > 0) {
- resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000);
+ resolver.setTimeout(Duration.ofMillis(timeoutMs));
}
lookup.setResolver(resolver);
Record[] records = lookup.run();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5038198..f8981d9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -126,6 +126,7 @@ 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>
</ul>
<!-- =================== Bug fixes =================== -->