v7.6.2

Author: JemyCheung

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

@@ -415,7 +415,12 @@ public static void startPrefetchDns(String token, Configuration config) {
      * @return
      */
     public static boolean recoverDnsCache(byte[] data) {
-        ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = (ConcurrentHashMap<String, List<InetAddress>>) StringUtils.toObject(data);
+        ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = null;
+        try {
+            concurrentHashMap = (ConcurrentHashMap<String, List<InetAddress>>) StringUtils.toObject(data);
+        }catch (Exception e){
+            return true;
+        }
         if (concurrentHashMap == null) {
             return true;
         }

library/src/main/java/com/qiniu/android/utils/StringUtils.java

@@ -147,15 +147,21 @@ public static String strip(String s) {
      */
     public static byte[] toByteArray(Object obj) {
         byte[] bytes = null;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
         try {
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(obj);
-            oos.flush();
-            bytes = bos.toByteArray();
-            oos.close();
-            bos.close();
-        } catch (Exception ex) {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            try {
+                ObjectOutputStream oos = new ObjectOutputStream(bos);
+                try {
+                    oos.writeObject(obj);
+                    oos.flush();
+                    bytes = bos.toByteArray();
+                } finally {
+                    oos.close();
+                }
+            } finally {
+                bos.close();
+            }
+        } catch (IOException ex) {
             ex.printStackTrace();
         }
         return bytes;
@@ -171,14 +177,17 @@ public static Object toObject(byte[] bytes) {
         Object obj = null;
         try {
             ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-            ObjectInputStream ois = new ObjectInputStream(bis);
-            obj = ois.readObject();
-            ois.close();
-            bis.close();
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        } catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
+            try {
+                ObjectInputStream ois = new ObjectInputStream(bis);
+                obj = ois.readObject();
+                ois.close();
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            } finally {
+                bis.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return obj;
     }