Merge pull request #385 from JemyCheung/master

exception

Author: bachue

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+# 7.6.2
+* 修复序列化异常
+* 更正打点日志字段
+
 # 7.6.1
 * 修复上传区域错误
 * 更正打点日志字段

README.md

@@ -24,7 +24,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 |  7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：7.6.1，7.6.1使用okhttp4.2.2
+* 推荐使用最新版：7.6.2，7.6.2使用okhttp4.2.2
 * 7.4.3是在7.5.2版本上降低okhttp版本，其他功能不变
 * 从 7.3.13 开始，不在强制依赖 `happy-dns-android`，默认不再提供 `httpDns`，可以调用 `Configuration.Builder#dns(com.qiniu.android.http.Dns)`方法设置外部 `Dns`，自定义 `Dns` 要求实现 `com.qiniu.android.http.Dns` 接口。
 * 从7.5.0开始增加了DNS预取和缓存策略，减少dns解析错误

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

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

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,14 +147,20 @@ 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();
+            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();
         }
@@ -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;
     }