From 694b13bb551222da9d0292c4b313ea1b96a0b34e Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 25 Jan 2024 19:39:35 +0100
Subject: [PATCH] avoid nullpointer in pillarservlet

---
 .../java/de/hsadmin/servlets/JsonPillarServlet.java  |  8 ++++----
 qserv/src/main/java/de/hsadmin/mods/dom/Domain.java  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java b/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java
index 02f854a..c6a76de 100644
--- a/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java
+++ b/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java
@@ -152,16 +152,16 @@ public class JsonPillarServlet extends HttpServlet {
 			}
 			writer.println("      }");
 			writer.println("      , \"validsubdomains\": \"" + validSubdomainNames + "\"");
-			if (passengerPython.length() > 0) {
+			if (passengerPython != null && passengerPython.length() > 0) {
 				writer.println("      , \"passengerpython\": \"" + passengerPython + "\"");
 			}
-			if (passengerNodejs.length() > 0) {
+			if (passengerNodejs != null && passengerNodejs.length() > 0) {
 				writer.println("      , \"passengernodejs\": \"" + passengerNodejs + "\"");
 			}
-			if (passengerRuby.length() > 0) {
+			if (passengerRuby != null && passengerRuby.length() > 0) {
 				writer.println("      , \"passengerruby\": \"" + passengerRuby + "\"");
 			}
-			if (fcgiPhpBin.length() > 0) {
+			if (fcgiPhpBin != null && fcgiPhpBin.length() > 0) {
 				writer.println("      , \"fcgiphpbin\": \"" + fcgiPhpBin + "\"");
 			}
 			writer.println("    }");
diff --git a/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java b/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
index 20638a9..22bd396 100644
--- a/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
+++ b/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
@@ -208,6 +208,9 @@ public class Domain extends AbstractEntity {
 	}
 
 	public String getPassengerpython() {
+		if (passengerpython == null) {
+			return "/usr/bin/python3";
+		}
 		return passengerpython;
 	}
 
@@ -216,6 +219,9 @@ public class Domain extends AbstractEntity {
 	}
 
 	public String getPassengernodejs() {
+		if (passengernodejs == null) {
+			return "/usr/bin/node";
+		}
 		return passengernodejs;
 	}
 
@@ -224,6 +230,9 @@ public class Domain extends AbstractEntity {
 	}
 
 	public String getPassengerruby() {
+		if (passengerruby == null) {
+			return "/usr/bin/ruby";
+		}
 		return passengerruby;
 	}
 
@@ -232,6 +241,9 @@ public class Domain extends AbstractEntity {
 	}
 
 	public String getFcgiphpbin() {
+		if (fcgiphpbin == null) {
+			return "/usr/lib/cgi-bin/php";
+		}
 		return fcgiphpbin;
 	}