fixup

olchick · olchick · commit ca5e410df05f · 2016-02-14T21:09:33.000+03:00
diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
@@ -379,9 +379,10 @@ public function updateDocument($id, $data, $index, $type, array $options = array
             }
         }
 
-        $retryOnConflict = $this->getConfig('retryOnConflict');
-        if (!isset($options['retry_on_conflict']) && !empty($retryOnConflict)) {
-            $options['retry_on_conflict'] = $retryOnConflict;
+        if (!isset($options['retry_on_conflict'])) {
+            if ($retryOnConflict = $this->getConfig('retryOnConflict')) {
+                $options['retry_on_conflict'] = $retryOnConflict;
+            }
         }
 
         $response = $this->request($path, Request::POST, $requestData, $options);

Original file line number	Diff line number	Diff line change
`@@ -379,9 +379,10 @@ public function updateDocument($id, $data, $index, $type, array $options = array`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
`382`		`- $retryOnConflict = $this->getConfig('retryOnConflict');`
`383`		`- if (!isset($options['retry_on_conflict']) && !empty($retryOnConflict)) {`
`384`		`- $options['retry_on_conflict'] = $retryOnConflict;`
	`382`	`+ if (!isset($options['retry_on_conflict'])) {`
	`383`	`+ if ($retryOnConflict = $this->getConfig('retryOnConflict')) {`
	`384`	`+ $options['retry_on_conflict'] = $retryOnConflict;`
	`385`	`+ }`
`385`	`386`	`}`
`386`	`387`
`387`	`388`	`$response = $this->request($path, Request::POST, $requestData, $options);`