From 8fc5133c4459574cd4ab32d1872fc2044f2ac3f9 Mon Sep 17 00:00:00 2001 From: Andrew Benton Date: Wed, 2 May 2012 01:10:30 -0700 Subject: [PATCH] pull response parsing outside of server failure retry loop --- lib/twilio-ruby/rest/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/twilio-ruby/rest/client.rb b/lib/twilio-ruby/rest/client.rb index 5b0d54710..8ff2a096c 100644 --- a/lib/twilio-ruby/rest/client.rb +++ b/lib/twilio-ruby/rest/client.rb @@ -212,13 +212,13 @@ def connect_and_send(request) # :doc: begin response = @connection.request request @last_response = response - object = MultiJson.load response.body if response.body if response.kind_of? Net::HTTPServerError - raise Twilio::REST::ServerError, object['message'] + raise Twilio::REST::ServerError end rescue Exception if retries_left > 0 then retries_left -= 1; retry else raise end end + object = MultiJson.load response.body if response.body if response.kind_of? Net::HTTPClientError raise Twilio::REST::RequestError.new object['message'], object['code'] end