From d041028308f518abdaeb988fea3580a470c374a4 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 24 Mar 2022 20:21:15 +0800
Subject: [PATCH] merge socket to master and fix httpdns cache has default

---
 .../src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt     | 4 ++--
 .../src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt
index 8da3e37..0a71a0d 100644
--- a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt
+++ b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt
@@ -118,7 +118,7 @@ internal class HttpDnsHelper(private val builder: MogoHttpDnsConfig) : Handler.C
         return defaultUrl ?: host
     }
 
-    override fun getHttpDnsCachedAddress(type: Int, _host: String): String? {
+    override fun getHttpDnsCachedAddress(type: Int, _host: String): String {
         val host = _host.toLowerCase(Locale.getDefault())
         httpDnsCache?.let {
             val currentLoc = builder.getCurrentLocation()?.getCurrentLocation()
@@ -140,7 +140,7 @@ internal class HttpDnsHelper(private val builder: MogoHttpDnsConfig) : Handler.C
             }
         }
         val default = defaultUrl ?: host
-        return addressMap?.get("$type-$host")
+        return addressMap?.get("$type-$host") ?: default
     }
 
     override fun getAllAddress(): Map<String, String>? {
diff --git a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt
index 8da3dea..60b14d4 100644
--- a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt
+++ b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt
@@ -18,7 +18,7 @@ object MogoHttpDnsClient : IMogoHttpDns {
      * 先从本地缓存中根据type和host获取ip:port，如果本地缓存中没有，再通过网络获取
      */
     fun getHttpDnsAddressUseCacheIfNecessary(type: Int, _host: String): String? {
-        return getHttpDnsCachedAddress(type, _host) ?: return getHttpDnsAddress(type, _host)
+        return getHttpDnsCachedAddress(type, _host)
     }
 
     override fun addressChangedListener(addressChangedListener: OnAddressChangedListener) {