@@ -67,7 +67,7 @@ |
||
| 67 | 67 | continue; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( ($item = $items->pop()) === null ) { |
|
| 70 | + if( ( $item = $items->pop() ) === null ) { |
|
| 71 | 71 | $item = $manager->createItem(); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -58,7 +58,8 @@ discard block |
||
| 58 | 58 | $manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/address' ); |
| 59 | 59 | $manager->begin(); |
| 60 | 60 | |
| 61 | - try { |
|
| 61 | + try |
|
| 62 | + { |
|
| 62 | 63 | $map = $this->getMappedChunk( $data, $this->getMapping() ); |
| 63 | 64 | $items = $supplier->getAddressItems(); |
| 64 | 65 | |
@@ -78,7 +79,9 @@ discard block |
||
| 78 | 79 | $data = $this->getObject()->process( $supplier, $data ); |
| 79 | 80 | |
| 80 | 81 | $manager->commit(); |
| 81 | - } catch( \Exception $e ) { |
|
| 82 | + } |
|
| 83 | + catch( \Exception $e ) |
|
| 84 | + { |
|
| 82 | 85 | $manager->rollback(); |
| 83 | 86 | throw $e; |
| 84 | 87 | } |