MAGETWO-72747: [Magento Cloud] - /rest/default/V1/order/<order id>/ship and configurable products - for 2.2

Eric Bohanon · Eric Bohanon · commit e97ce5b336bc · 2017-10-04T11:31:02.000-05:00
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
@@ -135,7 +135,7 @@ public function load()
                 return false;
             }
 
-            $shipmentItems = $this->getShipmentItems($this->getShipment());
+            $shipmentItems = $this->getShipmentItems($this->getShipment() ?: []);
 
             $shipment = $this->documentFactory->create(
                 $order,

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function load()`
`135`	`135`	`return false;`
`136`	`136`	`}`
`137`	`137`
`138`		`- $shipmentItems = $this->getShipmentItems($this->getShipment());`
	`138`	`+ $shipmentItems = $this->getShipmentItems($this->getShipment() ?: []);`
`139`	`139`
`140`	`140`	`$shipment = $this->documentFactory->create(`
`141`	`141`	`$order,`