From bbae17fd2505e7f47d6ba3e3ebcdd82fde261c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sun, 19 Nov 2023 09:29:19 +0100
Subject: [PATCH] Fix image in docker-compose and fix nullpointer exception
 when getting TaskSchedules

---
 .../main/java/core/entities/timemanager/Task.java  |  4 +++-
 docker-compose.yml                                 | 14 ++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index e2fb81e..9e6ceae 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -49,7 +49,6 @@ public class Task {
         this.eta = taskFieldInfo.getEta();
         this.finished = false;
         this.finishable = taskFieldInfo.isFinishable();
-        System.err.println(this.finishable);
     }
 
     public long getTaskID() {
@@ -125,6 +124,9 @@ public class Task {
     }
 
     public List<AbstractSchedule> getBasicTaskSchedules() {
+        if(basicTaskSchedules == null) {
+            return new ArrayList<>();
+        }
         return basicTaskSchedules;
     }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 84e34d0..83861fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,10 @@ services:
     ports:
       - "3306:3306"
   backend:
-    build:
-      context: ./backend
-      dockerfile: Dockerfile 
+    #build:
+      #context: ./backend
+      #dockerfile: Dockerfile 
+    image: git.fawkes100.de/sebastian/timemanager/timemanager-backend:latest 
     links:
       - "db:app_db"
     environment:
@@ -27,9 +28,10 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
   frontend:
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile 
+    #build:
+      #context: ./frontend
+      #dockerfile: Dockerfile 
+    image: git.fawkes100.de/sebastian/timemanager/timemanager-frontend:latest 
     restart: always
     links:
       - backend:backend