Skip to content

Commit dc0139a

Browse files
author
JemyCheung
committed
safety
1 parent cd36b7e commit dc0139a

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

library/src/main/java/com/qiniu/android/http/DnsPrefetcher.java

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.HashSet;
2323
import java.util.Iterator;
2424
import java.util.List;
25+
import java.util.Map;
2526
import java.util.concurrent.ConcurrentHashMap;
2627
import java.util.concurrent.atomic.AtomicReference;
2728

@@ -186,15 +187,18 @@ private boolean rePreFetch(String host, Dns customeDns) {
186187
public void dnsPreByCustom(Dns dns) {
187188
List<String> rePreHosts = new ArrayList<String>();
188189
if (mConcurrentHashMap != null && mConcurrentHashMap.size() > 0) {
189-
ArrayList<String> mHosts = (ArrayList<String>) mConcurrentHashMap.keySet();
190-
for (String host : mHosts) {
191-
List<InetAddress> inetAddresses = null;
192-
try {
193-
inetAddresses = dns.lookup(host);
194-
mConcurrentHashMap.put(host, inetAddresses);
195-
} catch (UnknownHostException e) {
196-
e.printStackTrace();
197-
rePreHosts.add(host);
190+
Iterator iter = mConcurrentHashMap.keySet().iterator();
191+
while (iter.hasNext()) {
192+
String tmpkey = (String) iter.next();
193+
if (!(tmpkey == null) && !(tmpkey.length() == 0)) {
194+
List<InetAddress> inetAddresses = null;
195+
try {
196+
inetAddresses = dns.lookup(tmpkey);
197+
mConcurrentHashMap.put(tmpkey, inetAddresses);
198+
} catch (UnknownHostException e) {
199+
e.printStackTrace();
200+
rePreHosts.add(tmpkey);
201+
}
198202
}
199203
}
200204
}
@@ -395,15 +399,6 @@ public static boolean recoverDnsCache(byte[] data) {
395399
return true;
396400
}
397401
DnsPrefetcher.getDnsPrefetcher().setConcurrentHashMap(concurrentHashMap);
398-
399-
ArrayList<String> list = new ArrayList<String>();
400-
Iterator iter = concurrentHashMap.keySet().iterator();
401-
while (iter.hasNext()) {
402-
String tmpkey = (String) iter.next();
403-
if (tmpkey == null || tmpkey.length() == 0)
404-
continue;
405-
list.add(tmpkey);
406-
}
407402
return false;
408403
}
409404
}

0 commit comments

Comments
 (0)