From be86a63ef9901d95ca8ea5d74c721aaa73349391 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 16 Aug 2016 19:01:21 +0200 Subject: [PATCH] avoid nullpointer --- .../src/main/java/de/hsadmin/service/pac/PacVO.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/services/src/main/java/de/hsadmin/service/pac/PacVO.java b/services/src/main/java/de/hsadmin/service/pac/PacVO.java index d22e5b1..cf6d718 100644 --- a/services/src/main/java/de/hsadmin/service/pac/PacVO.java +++ b/services/src/main/java/de/hsadmin/service/pac/PacVO.java @@ -68,6 +68,7 @@ public class PacVO extends AbstractVO implements ValueObject { @ReadWrite(ReadWritePolicy.READWRITE) @Display(sequence=70) + @Search(SearchPolicy.EQUALS) private Boolean free; @Required(true) @@ -167,10 +168,13 @@ public class PacVO extends AbstractVO implements ValueObject { if ("pacComponents".equals(p.getName())) { if (persistentObject instanceof Pac) { final Pac persistentPac = (Pac) persistentObject; - for (final PacComponentVO componentVO : getPacComponents()) { - final String feature = componentVO.getFeature(); - final Integer quantity = componentVO.getQuantity(); - persistentPac.getPacComponent(feature).setQuantity(quantity); + final List pacComps = getPacComponents(); + if (pacComps != null) { + for (final PacComponentVO componentVO : pacComps) { + final String feature = componentVO.getFeature(); + final Integer quantity = componentVO.getQuantity(); + persistentPac.getPacComponent(feature).setQuantity(quantity); + } } } } else {