From 93bb5141cbb820796a07aacb049b8269cdf93cd0 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Thu, 11 Mar 2021 16:20:42 +0100
Subject: [PATCH] openLoaded method NPE check

---
 .../main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java
index 1f8ecb0..a0f65b2 100644
--- a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java
+++ b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java
@@ -184,6 +184,12 @@ public class TapSchemaLoader implements Serializable {
     }
 
     public String openLoaded() {
+        
+        if (loadedTapSchema == null) {
+            throw new IllegalStateException("Attempted to access a TAP_SCHEMA not loaded yet. "
+                    + "This may be caused by an error on frontend or a browser cache issue.");
+        }
+        
         ConsistencyChecks checks = loadedTapSchema.getConsistencyChecks();
         if (checks != null && (checks.isInconsistent() || checks.isHasWarnings())) {
             consistencyChecksBean.setTapSchema(loadedTapSchema);
-- 
GitLab