From 31c15ff158d0c89f1008e315d107c917c074c160 Mon Sep 17 00:00:00 2001
From: William Enright <william.enright@savoirfairelinux.com>
Date: Thu, 4 Jun 2020 15:41:49 -0400
Subject: [PATCH] Fixed bad login page on first startup
---
.../jams/server/servlets/api/install/StartInstallServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java
index 92cb3c9d..af847d6e 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java
@@ -53,7 +53,7 @@ public class StartInstallServlet extends HttpServlet {
//Here we must decide which page to show - login or sign-up
StatementList statementList = new StatementList();
statementList.addStatement(new StatementElement("username","=","*",""));
- if(dataStore.getUserDao().getObjects(null).size() > 0)
+ if(dataStore != null && dataStore.getUserDao() != null && dataStore.getUserDao().getObjects(null).size() > 0)
resp.setHeader("showLogin","true");
else
resp.setHeader("showLogin","false");
--
GitLab