Skip to content

Commit 940348e

Browse files
authored
Merge pull request #6523 from effective-webwork/calendar-npe-fix
Prevent NPE in calendar when selecting same granularity twice
2 parents d46bdba + e2b26a7 commit 940348e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,12 @@ public Granularity getGranularity() {
223223
* @param granularity as org.kitodo.production.model.bibliography.course.Granularity
224224
*/
225225
public void setGranularity(Granularity granularity) {
226-
this.granularity = granularity;
227-
course.splitInto(granularity);
228-
if (Objects.nonNull(PrimeFaces.current()) && Objects.nonNull(FacesContext.getCurrentInstance())) {
229-
PrimeFaces.current().ajax().update("createProcessesConfirmDialog");
226+
if (Objects.nonNull(granularity)) {
227+
this.granularity = granularity;
228+
course.splitInto(granularity);
229+
if (Objects.nonNull(PrimeFaces.current()) && Objects.nonNull(FacesContext.getCurrentInstance())) {
230+
PrimeFaces.current().ajax().update("createProcessesConfirmDialog");
231+
}
230232
}
231233
}
232234

0 commit comments

Comments
 (0)