Merge pull request #360 from JemyCheung/safety

safety code

Author: bachue

android-sdk.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

library/src/main/java/com/qiniu/android/common/Constants.java

@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.5.1";
+    public static final String VERSION = "7.5.2";
 
     public static final String UTF_8 = "utf-8";
 }

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

@@ -22,6 +22,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -37,7 +38,6 @@ public class DnsPrefetcher {
     private static Configuration config;
 
     private static ConcurrentHashMap<String, List<InetAddress>> mConcurrentHashMap = new ConcurrentHashMap<String, List<InetAddress>>();
-    private static List<String> mHosts = new ArrayList<String>();
     private static AtomicReference mDnsCacheKey = new AtomicReference();
 
     private DnsPrefetcher() {
@@ -75,7 +75,6 @@ public void localFetch() {
             preFetch(localHosts);
     }
 
-
     public DnsPrefetcher init(String token, Configuration config) throws UnknownHostException {
         this.token = token;
         this.config = config;
@@ -89,15 +88,6 @@ public void setConcurrentHashMap(ConcurrentHashMap<String, List<InetAddress>> mC
         this.mConcurrentHashMap = mConcurrentHashMap;
     }
 
-    //use for test
-    public List<String> getHosts() {
-        return this.mHosts;
-    }
-
-    public void setHosts(List mHosts) {
-        this.mHosts = mHosts;
-    }
-
     //use for test
     public ConcurrentHashMap<String, List<InetAddress>> getConcurrentHashMap() {
         return this.mConcurrentHashMap;
@@ -145,7 +135,6 @@ private void preFetch(List<String> fetchHost) {
             try {
                 inetAddresses = okhttp3.Dns.SYSTEM.lookup(host);
                 mConcurrentHashMap.put(host, inetAddresses);
-                mHosts.add(host);
             } catch (UnknownHostException e) {
                 e.printStackTrace();
                 rePreHosts.add(host);
@@ -181,7 +170,6 @@ private boolean rePreFetch(String host, Dns customeDns) {
                 inetAddresses = customeDns.lookup(host);
             }
             mConcurrentHashMap.put(host, inetAddresses);
-            mHosts.add(host);
             return true;
         } catch (UnknownHostException e) {
             e.printStackTrace();
@@ -198,14 +186,20 @@ private boolean rePreFetch(String host, Dns customeDns) {
      */
     public void dnsPreByCustom(Dns dns) {
         List<String> rePreHosts = new ArrayList<String>();
-        for (String host : mHosts) {
-            List<InetAddress> inetAddresses = null;
-            try {
-                inetAddresses = dns.lookup(host);
-                mConcurrentHashMap.put(host, inetAddresses);
-            } catch (UnknownHostException e) {
-                e.printStackTrace();
-                rePreHosts.add(host);
+        if (mConcurrentHashMap != null && mConcurrentHashMap.size() > 0) {
+            Iterator iter = mConcurrentHashMap.keySet().iterator();
+            while (iter.hasNext()) {
+                String tmpkey = (String) iter.next();
+                if (!(tmpkey == null) && !(tmpkey.length() == 0)) {
+                    List<InetAddress> inetAddresses = null;
+                    try {
+                        inetAddresses = dns.lookup(tmpkey);
+                        mConcurrentHashMap.put(tmpkey, inetAddresses);
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                        rePreHosts.add(tmpkey);
+                    }
+                }
             }
         }
         rePreFetch(rePreHosts, dns);
@@ -405,16 +399,6 @@ public static boolean recoverDnsCache(byte[] data) {
             return true;
         }
         DnsPrefetcher.getDnsPrefetcher().setConcurrentHashMap(concurrentHashMap);
-
-        ArrayList<String> list = new ArrayList<String>();
-        Iterator iter = concurrentHashMap.keySet().iterator();
-        while (iter.hasNext()) {
-            String tmpkey = (String) iter.next();
-            if (tmpkey == null || tmpkey.length() == 0)
-                continue;
-            list.add(tmpkey);
-        }
-        DnsPrefetcher.getDnsPrefetcher().setHosts(list);
         return false;
     }
 }

library/src/main/java/com/qiniu/android/storage/UploadManager.java

@@ -160,12 +160,12 @@ public void put(final byte[] data, final String key, final String token,
         }
         //此处是对uc.qbox.me接口获取的域名进行预取
         if (DnsPrefetcher.checkRePrefetchDns(token, config)) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    DnsPrefetcher.startPrefetchDns(token, config);
-                }
-            }).start();
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        DnsPrefetcher.startPrefetchDns(token, config);
+                    }
+                }).start();
         }
 
         Zone z = config.zone;
@@ -220,12 +220,12 @@ public void put(final File file, final String key, final String token,
         }
         //此处是每次上传时判断，对uc.qbox.me接口获取的host+sdk内置的host进行预取(去重)
         if (DnsPrefetcher.checkRePrefetchDns(token, config)) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    DnsPrefetcher.startPrefetchDns(token, config);
-                }
-            }).start();
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        DnsPrefetcher.startPrefetchDns(token, config);
+                    }
+                }).start();
         }
 
         Zone z = config.zone;