fixed NPE in calendar conflict check. close #2704

jlawyerorg · Nov 25, 2024 · ab95959 · ab95959
1 parent fd5875c
commit ab95959
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/j-lawyer-client/src/de/costache/calendar/model/CalendarEvent.java b/j-lawyer-client/src/de/costache/calendar/model/CalendarEvent.java
@@ -293,7 +293,9 @@ public String toString() {
     }
 
     public String getCaseLawyer() {
-        return this.getCaseDto().getLawyer();
+        if(this.getCaseDto()!=null)
+            return this.getCaseDto().getLawyer();
+        return "";
     }
 
     public String getAssignee() {
@@ -308,28 +310,38 @@ public enum Property {
      * @return the caseId
      */
     public String getCaseId() {
-        return this.getCaseDto().getId();
+        if(this.getCaseDto()!=null)
+            return this.getCaseDto().getId();
+        return "";
+
     }
 
     /**
      * @return the caseNumber
      */
     public String getCaseNumber() {
-        return this.getCaseDto().getFileNumber();
+        if(this.getCaseDto()!=null)
+            return this.getCaseDto().getFileNumber();
+        return "";
+
     }
 
     /**
      * @return the caseName
      */
     public String getCaseName() {
-        return this.getCaseDto().getName();
+        if(this.getCaseDto()!=null)
+            return this.getCaseDto().getName();
+        return "";
     }
 
     /**
      * @return the caseReason
      */
     public String getCaseReason() {
-        return this.getCaseDto().getReason();
+        if(this.getCaseDto()!=null)
+            return this.getCaseDto().getReason();
+        return "";
     }
 
     /**