From: Benny Baumann <BenBE1987@gmx.net>
Date: Sun, 31 Jul 2016 12:16:37 +0000 (+0200)
Subject: fix: Possible NPE when no menu previously existed
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a027342432533e219e18950a3d27abd64a1f64ba

fix: Possible NPE when no menu previously existed

Change-Id: I2cc63e42b339a6ab3a5e482b22ef6010f42388ac
---

diff --git a/util-testing/org/cacert/gigi/DevelLauncher.java b/util-testing/org/cacert/gigi/DevelLauncher.java
index 6639635b..736947d5 100644
--- a/util-testing/org/cacert/gigi/DevelLauncher.java
+++ b/util-testing/org/cacert/gigi/DevelLauncher.java
@@ -122,8 +122,12 @@ public class DevelLauncher {
 
             // Check if we got a proper map (as much as we can tell)
             Object pagesObj = pageF.get(gigi);
+            if ( !(pagesObj instanceof Map)) {
+                throw new Error("Invalid state when initializing page structure");
+            }
+
             @SuppressWarnings("unchecked")
-            HashMap<String, Page> pages = pagesObj instanceof Map ? new HashMap<>((Map<String, Page>) pagesObj) : null;
+            HashMap<String, Page> pages = new HashMap<>((Map<String, Page>) pagesObj);
 
             pages.put("/manage", new Page("Page-manager") {