fix use case DNSResolver for Consul

belaban · Feb 7, 2022 · 5a1ac36 · 5a1ac36
1 parent c79ee74
commit 5a1ac36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/org/jgroups/protocols/dns/AddressedDNSResolver.java b/src/org/jgroups/protocols/dns/AddressedDNSResolver.java
@@ -26,7 +26,7 @@ public AddressedDNSResolver(String dnsContextFactory, String dnsAddress) throws
     }
 
     @Override
-    protected List<Address> resolveAEntries(String dnsQuery) {
+    protected List<Address> resolveAEntries(String dnsQuery, String srcPort) {
         List<Address> addresses = new ArrayList<>();
         try {
             // We are parsing this kind of structure:
@@ -37,7 +37,12 @@ protected List<Address> resolveAEntries(String dnsQuery) {
                 NamingEnumeration<?> namingEnumeration = attributes.get(DNSRecordType.A.toString()).getAll();
                 while (namingEnumeration.hasMoreElements()) {
                     try {
-                        addresses.add(new IpAddress(namingEnumeration.nextElement().toString()));
+                        int p = Integer.parseInt(srcPort);
+                        if (p == 0) {
+                            addresses.add(new IpAddress(namingEnumeration.nextElement().toString()));
+                        } else {
+                            addresses.add(new IpAddress(namingEnumeration.nextElement().toString(), p));
+                        }
                     } catch (Exception e) {
                         log.trace("non critical DNS resolution error", e);
                     }

diff --git a/src/org/jgroups/protocols/dns/DefaultDNSResolver.java b/src/org/jgroups/protocols/dns/DefaultDNSResolver.java
@@ -106,7 +106,7 @@ protected List<Address> resolveAEntries(String dnsQuery) {
         return resolveAEntries(dnsQuery, "0");
     }
 
-    protected static List<Address> resolveAEntries(String dnsQuery, String srcPort) {
+    protected List<Address> resolveAEntries(String dnsQuery, String srcPort) {
         List<Address> addresses = new ArrayList<>();
         try {
             InetAddress[] inetAddresses = InetAddress.getAllByName(dnsQuery);