AWS: Fix CLASSPATH to prevent NULL entry

openHPI · Sep 26, 2024 · 4f55a34 · 4f55a34
1 parent 636a30e
commit 4f55a34
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/deploy/aws/java11Exec/src/main/java/poseidon/App.java b/deploy/aws/java11Exec/src/main/java/poseidon/App.java
@@ -96,7 +96,11 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayV2WebSocketEve
             ProcessBuilder pb = new ProcessBuilder(cmd);
             pb.directory(workingDirectory);
             Map<String, String> env = pb.environment();
-            env.put("CLASSPATH", ".:/var/task/lib/org.hamcrest.hamcrest-3.0.jar:/var/task/lib/junit.junit-4.13.2.jar:" + env.get("CLASSPATH"));
+            if (env.containsKey("CLASSPATH")) {
+                env.put("CLASSPATH", ".:/var/task/lib/org.hamcrest.hamcrest-3.0.jar:/var/task/lib/junit.junit-4.13.2.jar:" + env.get("CLASSPATH"));
+            } else {
+                env.put("CLASSPATH", ".:/var/task/lib/org.hamcrest.hamcrest-3.0.jar:/var/task/lib/junit.junit-4.13.2.jar");
+            }
             Process p = pb.start();
             InputStream stdout = p.getInputStream(), stderr = p.getErrorStream();
             this.forwardOutput(p, stdout, stderr);