From caca861c7bf0485a149088234ead906bc53fee8d Mon Sep 17 00:00:00 2001 From: Stephen Baynham Date: Tue, 21 Jul 2015 20:09:51 -0400 Subject: [PATCH] Fixes #35 If there is a problem reading the blacklist file from disk, previously, null would be returned from the DDSaveHandler.readBlacklist method. This would result in a crash later on down the line when we tried to iterate the blacklist. Now we return an empty array. I'd like to be able to diagnose the issues causing the blacklist file to be corrupted, but unfortunately when this issue crops up, people only post the crash :( --- .../StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java index 0d9cd8ad..9f64c212 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java @@ -424,12 +424,14 @@ public class DDSaveHandler { try { - return reader.readFromFile(blacklistFile); + List list = reader.readFromFile(blacklistFile); + if (list == null) + return new ArrayList(0); } catch (Exception e) { e.printStackTrace(); - return null; + return new ArrayList(0); } }