jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1654575 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java xdocs/changes.xml
Date Sat, 24 Jan 2015 19:51:20 GMT
Author: fschumacher
Date: Sat Jan 24 19:51:20 2015
New Revision: 1654575

URL: http://svn.apache.org/r1654575
Log:
Bug 57447 - Use only the user listed DNS Servers, when "use custom DNS resolver"
option is enabled.
Bugzilla Id: 57447

Added:
    jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java?rev=1654575&r1=1654574&r2=1654575&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
Sat Jan 24 19:51:20 2015
@@ -42,7 +42,6 @@ import org.xbill.DNS.ExtendedResolver;
 import org.xbill.DNS.Lookup;
 import org.xbill.DNS.Record;
 import org.xbill.DNS.Resolver;
-import org.xbill.DNS.SimpleResolver;
 import org.xbill.DNS.TextParseException;
 import org.xbill.DNS.Type;
 
@@ -104,12 +103,17 @@ public class DNSCacheManager extends Con
         clone.cache = new LinkedHashMap<String, InetAddress[]>();
         CollectionProperty dnsServers = getServers();
         try {
-            clone.resolver = new ExtendedResolver();
+            String[] serverNames = new String[dnsServers.size()];
             PropertyIterator dnsServIt = dnsServers.iterator();
+            int index=0;
             while (dnsServIt.hasNext()) {
-                String dnsServer = dnsServIt.next().getStringValue();
-                ((ExtendedResolver) clone.resolver).addResolver(new SimpleResolver(dnsServer));
+                serverNames[index] = dnsServIt.next().getStringValue();
+                index++;
             }
+            clone.resolver = new ExtendedResolver(serverNames);
+            log.debug("Using DNS Resolvers: "
+                    + Arrays.asList(((ExtendedResolver) clone.resolver)
+                            .getResolvers()));
             // resolvers will be chosen via round-robin
             ((ExtendedResolver) clone.resolver).setLoadBalance(true);
         } catch (UnknownHostException uhe) {
@@ -146,13 +150,13 @@ public class DNSCacheManager extends Con
      */
     private InetAddress[] requestLookup(String host) throws UnknownHostException {
         InetAddress[] addresses = null;
-        if (isCustomResolver() && ((ExtendedResolver) resolver).getResolvers().length
> 1) {
+        if (isCustomResolver() && ((ExtendedResolver) resolver).getResolvers().length
> 0) {
             try {
                 Lookup lookup = new Lookup(host, Type.A);
                 lookup.setCache(lookupCache);
                 lookup.setResolver(resolver);
                 Record[] records = lookup.run();
-                if (records.length == 0) {
+                if (records == null || records.length == 0) {
                     throw new UnknownHostException("Failed to resolve host name: " + host);
                 }
                 addresses = new InetAddress[records.length];

Added: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java?rev=1654575&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
(added)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
Sat Jan 24 19:51:20 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+package org.apache.jmeter.protocol.http.control;
+
+import java.net.UnknownHostException;
+
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.junit.Test;
+
+public class TestDNSCacheManager extends JMeterTestCase {
+
+    @Test
+    public void testCloneWithCustomResolverAndInvalidNameserver() throws UnknownHostException
{
+        DNSCacheManager original = new DNSCacheManager();
+        original.setCustomResolver(true);
+        original.addServer("127.0.0.99");
+        DNSCacheManager clone = (DNSCacheManager) original.clone();
+        try {
+            clone.resolve("jmeter.apache.org");
+            fail();
+        } catch (UnknownHostException e) {
+            // OK
+        }
+    }
+
+}

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1654575&r1=1654574&r2=1654575&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Jan 24 19:51:20 2015
@@ -150,6 +150,7 @@ See  <bugzilla>56357</bugzilla> for deta
 
 <h3>Controllers</h3>
 <ul>
+<li><bug>57447</bug>Use only the user listed DNS Servers, when "use custom
DNS resolver" option is enabled.
 </ul>
 
 <h3>Listeners</h3>



Mime
View raw message