Update UserManager.java

Author: caoli5288

src/main/java/com/mengcraft/playersql/PluginMain.java

@@ -70,7 +70,7 @@ public Player getPlayer(UUID uuid) {
     }
 
     public void logException(Exception e) {
-        getLogger().log(Level.WARNING, e.getMessage(), e);
+        getLogger().log(Level.WARNING, e.toString(), e);
     }
 
     public void logMessage(String s) {

src/main/java/com/mengcraft/playersql/UserManager.java

@@ -2,6 +2,7 @@
 
 import com.mengcraft.playersql.lib.ExpUtil;
 import com.mengcraft.playersql.lib.ItemUtil;
+import com.mengcraft.playersql.lib.JSONUtil;
 import com.mengcraft.playersql.task.DailySaveTask;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -10,9 +11,13 @@
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitTask;
 import org.json.simple.JSONArray;
-import org.json.simple.JSONValue;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -167,7 +172,11 @@ public void unlockUser(UUID uuid, boolean scheduled) {
      */
     public void pendFetched() {
         while (!this.fetched.isEmpty()) {
-            pend(this.fetched.poll());
+            try {
+                pend(this.fetched.poll());
+            } catch (Exception e) {
+                main.logException(e);
+            }
         }
     }
 
@@ -215,7 +224,7 @@ private void pend(User polled, Player player) {
 
     @SuppressWarnings("unchecked")
     private List<PotionEffect> toEffect(String data) {
-        List<List> parsed = (List) JSONValue.parse(data);
+        List<List> parsed = JSONUtil.parseArray(data, JSONUtil.EMPTY_ARRAY);
         List<PotionEffect> output = new ArrayList<>(parsed.size());
         for (List<Number> entry : parsed) {
             output.add(new PotionEffect(PotionEffectType.getById(entry.get(0).intValue()), entry.get(1).intValue(), entry.get(2).intValue()));
@@ -225,7 +234,7 @@ private List<PotionEffect> toEffect(String data) {
 
     @SuppressWarnings("unchecked")
     private ItemStack[] toStack(String data) {
-        List<String> parsed = (List) JSONValue.parse(data);
+        List<String> parsed = JSONUtil.parseArray(data, JSONUtil.EMPTY_ARRAY);
         List<ItemStack> output = new ArrayList<>(parsed.size());
         for (String s : parsed)
             if (s == null) {

src/main/java/com/mengcraft/playersql/lib/JSONUtil.java

@@ -0,0 +1,30 @@
+package com.mengcraft.playersql.lib;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+/**
+ * Created on 16-1-19.
+ */
+public final class JSONUtil {
+
+    public static JSONObject parseObject(String in, JSONObject normal) {
+        Object parsed = JSONValue.parse(in);
+        if (parsed instanceof JSONObject) {
+            return (JSONObject) parsed;
+        }
+        return normal;
+    }
+
+    public static JSONArray parseArray(String in, JSONArray normal) {
+        Object parsed = JSONValue.parse(in);
+        if (parsed instanceof JSONArray) {
+            return ((JSONArray) parsed);
+        }
+        return normal;
+    }
+
+    public static final JSONArray EMPTY_ARRAY = new JSONArray();
+
+}

src/main/java/com/mengcraft/playersql/task/FetchUserTask.java

@@ -2,7 +2,6 @@
 
 import com.mengcraft.playersql.Config;
 import com.mengcraft.playersql.EventExecutor;
-import com.mengcraft.playersql.PluginException;
 import com.mengcraft.playersql.User;
 
 import java.util.UUID;
@@ -31,18 +30,18 @@ public synchronized void run() {
             this.executor.getUserManager().unlockUser(this.uuid, true);
         } else if (user.isLocked() && this.retryCount++ < 8) {
             if (Config.DEBUG) {
-                this.executor.getMain().logException(new PluginException("Fetch " + this.uuid + " retry " + this.retryCount + '.'));
+                this.executor.getMain().logMessage("Load user " + uuid + " retry at " + retryCount + '.');
             }
         } else {
             if (Config.DEBUG) {
-                this.executor.getMain().logMessage("Load user " + this.uuid + " done. Scheduling store data.");
+                this.executor.getMain().logMessage("Load user " + uuid + " done. Scheduling store data.");
             }
             this.executor.getUserManager().cacheUser(this.uuid, user);
             this.executor.getUserManager().addFetched(user);
             this.executor.cancelTask(this.taskId);
             this.executor.getUserManager().saveUser(user, true);
             if (Config.DEBUG) {
-                this.executor.getMain().logMessage("Lock user " + this.uuid + " on database done.");
+                this.executor.getMain().logMessage("Lock user " + uuid + " done.");
             }
         }
     }