|
|
@@ -7,6 +7,7 @@ import se.citerus.dddsample.domain.model.DomainEvent;
|
|
7
|
7
|
import se.citerus.dddsample.domain.model.cargo.Cargo;
|
|
8
|
8
|
import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
|
|
9
|
9
|
import se.citerus.dddsample.domain.model.location.Location;
|
|
|
10
|
+import se.citerus.dddsample.domain.shared.DomainObjectUtils;
|
|
10
|
11
|
|
|
11
|
12
|
import java.util.Comparator;
|
|
12
|
13
|
import java.util.Date;
|
|
|
@@ -132,7 +133,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
|
|
132
|
133
|
}
|
|
133
|
134
|
|
|
134
|
135
|
public CarrierMovement carrierMovement() {
|
|
135
|
|
- return this.carrierMovement;
|
|
|
136
|
+ return DomainObjectUtils.nullSafe(this.carrierMovement, CarrierMovement.NONE);
|
|
136
|
137
|
}
|
|
137
|
138
|
|
|
138
|
139
|
public Date completionTime() {
|