Null check, removed unused methods.

peterbacklund · peterbacklund · commit f6417be44528 · 2010-03-06T18:19:46.000Z
diff --git a/dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Cargo.java b/dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Cargo.java
@@ -262,6 +262,10 @@ public Location earliestReroutingLocation() {
    * that describes a continuous route even if the cargo is currently misdirected.
    */
   public Itinerary itineraryMergedWith(final Itinerary other) {
+    if (this.itinerary == null) {
+      return other;
+    }
+
     if (isMisdirected() && transportStatus() == ONBOARD_CARRIER) {
       final Leg currentLeg = Leg.deriveLeg(
         currentVoyage(), lastKnownLocation(), currentVoyage().arrivalLocationAfterDepartureFrom(lastKnownLocation())
diff --git a/dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Leg.java b/dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Leg.java
@@ -115,22 +115,6 @@ boolean matchesActivity(final HandlingActivity handlingActivity) {
     return false;
   }
 
-  Leg ifLoadLocationSameAs(final HandlingActivity handlingActivity) {
-    if (loadLocation.sameAs(handlingActivity.location())) {
-      return this;
-    } else {
-      return null;
-    }
-  }
-
-  Leg ifUnloadLocationSameAs(final HandlingActivity handlingActivity) {
-    if (unloadLocation.sameAs(handlingActivity.location())) {
-      return this;
-    } else {
-      return null;
-    }
-  }
-
   HandlingActivity deriveLoadActivity() {
     return loadOnto(voyage).in(loadLocation);
   }
