using current uuid if last response does not have location header

myfreecomm · Apr 3, 2014 · e4fb397 · e4fb397
1 parent c1186e4
commit e4fb397
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/charging/charge_account.rb b/lib/charging/charge_account.rb
@@ -135,7 +135,7 @@ def invalid_domain?
     end
 
     def reload_attributes!
-      new_charge_account = self.class.find_by_uuid(domain, Helpers.extract_uuid(last_response.headers[:location]))
+      new_charge_account = self.class.find_by_uuid(domain, Helpers.extract_uuid(last_response.headers[:location]) || uuid)
 
       (ATTRIBUTES + COMMON_ATTRIBUTES + READ_ONLY_ATTRIBUTES).each do |attribute|
         instance_variable_set "@#{attribute}", new_charge_account.send(attribute)

diff --git a/lib/charging/domain.rb b/lib/charging/domain.rb
@@ -107,7 +107,7 @@ def self.load_persisted_domain(attributes, response, account = nil) # :nodoc:
     private
 
     def reload_attributes!
-      new_domain = self.class.find_by_uuid(account, Helpers.extract_uuid(last_response.headers[:location]))
+      new_domain = self.class.find_by_uuid(account, Helpers.extract_uuid(last_response.headers[:location]) || uuid)
 
       (COMMON_ATTRIBUTES + READ_ONLY_ATTRIBUTES).each do |attribute|
         instance_variable_set "@#{attribute}", new_domain.send(attribute)

diff --git a/lib/charging/invoice.rb b/lib/charging/invoice.rb
@@ -33,7 +33,7 @@ def create!
         Invoice.post_charge_accounts_invoices(domain, charge_account, attributes)
       end
 
-      reload_attributes!(Helpers.extract_uuid(last_response.headers[:location]))
+      reload_attributes!(Helpers.extract_uuid(last_response.headers[:location]) || uuid)
     end
 
     # Deletes the invoice at API