1.4.6 <=> Fixed rare NPE

mynttt · Jan 4, 2021 · 79fc3a3 · 79fc3a3
1 parent 65f4335
commit 79fc3a3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.4.6
+- Fixed rare NPE
+
 ## 1.4.5
 - Fixed crash on malformed XML
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.5
+1.4.6
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'com.github.spotbugs' version '2.0.1'
 }
 
-version = '1.4.5'
+version = '1.4.6'
 sourceCompatibility = '11'
 
 new File(projectDir, "VERSION").text = version;

diff --git a/src/main/java/updatetool/common/KeyValueStore.java b/src/main/java/updatetool/common/KeyValueStore.java
@@ -1,14 +1,13 @@
 package updatetool.common;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class KeyValueStore {
     private final HashMap<String, String> map = new HashMap<>();
@@ -18,13 +17,14 @@ private KeyValueStore(Path p) {
         this.p = p;
     }
 
+    @SuppressFBWarnings("REC_CATCH_EXCEPTION")
     @SuppressWarnings("serial")
     public static KeyValueStore of(Path p) {
         var cache = new KeyValueStore(p);
         try {
             HashMap<String, String> m = new Gson().fromJson(Files.readString(p, StandardCharsets.UTF_8), new TypeToken<HashMap<String, String>>() {}.getType());
             cache.map.putAll(m);
-        } catch(JsonSyntaxException | IOException e) {}
+        } catch(Exception e) {}
         return cache;
     }
 

diff --git a/src/main/resources/VERSION b/src/main/resources/VERSION
@@ -1 +1 @@
-1.4.5
+1.4.6