Check if bundle is still valid before dispatching

Fixes #13
dtn7 · Aug 28, 2019 · c556a66 · c556a66
1 parent ee62d62
commit c556a66
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/core/processing.go b/core/processing.go
@@ -137,7 +137,16 @@ func (c *Core) dispatching(bp BundlePack) {
 		return
 	}
 
-	if c.HasEndpoint(bp.MustBundle().PrimaryBlock.Destination) {
+	bndl, err := bp.Bundle()
+	if err != nil {
+		log.WithFields(log.Fields{
+			"bundleID": bp.Id,
+			"error":    err.Error(),
+		}).Warn("Error dispatching bundle")
+		return
+	}
+
+	if c.HasEndpoint(bndl.PrimaryBlock.Destination) {
 		c.localDelivery(bp)
 	} else {
 		c.forward(bp)