Merge branch 'TRADE-501' into 'master'

classes/fpf/http/CurlHttpClient.php

@@ -168,9 +168,9 @@ class CurlHttpClient
         // Connect failed?
         if (!$this->response) {
             curl_close($this->curl_handle);
-            $this->curl_handle = null;
             $error = 'CurlHttpClient: Could not connect to ' . $full_url;
             \Yii::$app->fpf->error('http',  curl_errno($this->curl_handle), __CLASS__, __FUNCTION__,  ' ERROR:' .$error);
+            $this->curl_handle = null;
             throw new CurlHttpException($error, CurlHttpException::NOT_OPEN);
         }
     }

classes/fpf/thrift/TCurlClient.php

@@ -235,9 +235,9 @@ class TCurlClient extends \Thrift\Transport\TTransport
         // Connect failed?
         if (!$this->response_) {
             curl_close($this->handle);
-            $this->handle = null;
             $error = 'TCurlClient: Could not connect to ' . $full_url;
             \Yii::$app->fpf->error('http',  curl_errno($this->handle), __CLASS__, __FUNCTION__,  ' ERROR:' .$error);
+            $this->handle = null;
             throw new TTransportException($error, TTransportException::NOT_OPEN);
         }
     }