✔️ Coverity - Dereference null return value

evrignaud · May 11, 2016 · 73b6e1d · 73b6e1d
1 parent 10d54b4
commit 73b6e1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/fim/internal/StateManager.java b/src/main/java/org/fim/internal/StateManager.java
@@ -65,9 +65,6 @@ public State loadState(int stateNumber, boolean loadFullState) throws IOExceptio
 
         try {
             State state = State.loadFromGZipFile(stateFile, loadFullState);
-            if (state == null) {
-                throw new CorruptedStateException();
-            }
 
             if (loadFullState) {
                 adjustAccordingToHashMode(state);

diff --git a/src/main/java/org/fim/model/State.java b/src/main/java/org/fim/model/State.java
@@ -85,6 +85,9 @@ public static State loadFromGZipFile(Path stateFile, boolean loadFullState) thro
         try (Reader reader = new InputStreamReader(new GZIPInputStream(new FileInputStream(stateFile.toFile())))) {
             Gson gson = new Gson();
             State state = gson.fromJson(reader, State.class);
+            if (state == null) {
+                throw new CorruptedStateException();
+            }
 
             if (loadFullState) {
                 if (!CURRENT_MODEL_VERSION.equals(state.getModelVersion())) {