From 241fc69d82307e2c1c4ed69dc1509a285899a00a Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Fri, 18 Nov 2011 17:00:45 +0000
Subject: [PATCH] Rename combined DNS host lookup

---
 .../jabber/ProtocolProviderServiceJabberImpl.java     |  4 ++--
 src/net/java/sip/communicator/util/NetworkUtils.java  | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index c50972913..32faaaf6d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -512,7 +512,7 @@ private void connectAndLogin(SecurityAuthority authority,
                         try
                         {
                             addrs =
-                                NetworkUtils.getAorAAAARecords(
+                                NetworkUtils.getAandAAAARecords(
                                     srv.getTarget(),
                                     srv.getPort()
                                 );
@@ -557,7 +557,7 @@ private void connectAndLogin(SecurityAuthority authority,
             InetSocketAddress[] addrs = null;
             try
             {
-                addrs = NetworkUtils.getAorAAAARecords(
+                addrs = NetworkUtils.getAandAAAARecords(
                     serverAddressUserSetting,
                     serverPort
                 );
diff --git a/src/net/java/sip/communicator/util/NetworkUtils.java b/src/net/java/sip/communicator/util/NetworkUtils.java
index d234c90ef..9e6f019d2 100644
--- a/src/net/java/sip/communicator/util/NetworkUtils.java
+++ b/src/net/java/sip/communicator/util/NetworkUtils.java
@@ -824,15 +824,16 @@ public static InetAddress getInetAddress(String hostAddress)
     }
 
     /**
-     * Returns array of hosts from the A or AAAA record of the specified domain.
-     * The records are ordered against the IPv4/IPv6 protocol priority
+     * Returns array of hosts from the A and AAAA records of the specified
+     * domain. The records are ordered against the IPv4/IPv6 protocol priority
+     * 
      * @param domain the name of the domain we'd like to resolve.
      * @param port the port number of the returned <tt>InetSocketAddress</tt>
      * @return an array of InetSocketAddress containing records returned by the
-     * DNS server - address and port .
+     *         DNS server - address and port .
      * @throws ParseException if <tt>domain</tt> is not a valid domain name.
      */
-    public static InetSocketAddress[] getAorAAAARecords(String domain, int port)
+    public static InetSocketAddress[] getAandAAAARecords(String domain, int port)
         throws ParseException
     {
         List<InetSocketAddress> addresses = new LinkedList<InetSocketAddress>();
@@ -879,7 +880,7 @@ public static InetSocketAddress[] getAorAAAARecords(String domain, int port)
             }
             v6lookup = !v6lookup;
         }
-        return (InetSocketAddress[])addresses.toArray(new InetSocketAddress[0]);
+        return addresses.toArray(new InetSocketAddress[0]);
     }
 
     /**