only upload media if there is one

[arvados.git] / lib / google / api_client / request.rb

diff --git a/lib/google/api_client/request.rb b/lib/google/api_client/request.rb
index bed87a1aeab9e2061695df07849b5da7bdf82c3d..78ec87793368db05b3e81bed2588f9f44d6292eb 100644 (file)
--- a/lib/google/api_client/request.rb
+++ b/lib/google/api_client/request.rb
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 require 'faraday'
-require 'faraday/utils'
 require 'faraday/request/multipart'
 require 'multi_json'
 require 'compat/multi_json'
@@ -169,7 +168,7 @@ module Google
 
         # Resumamble slightly different than other upload protocols in that it requires at least
         # 2 requests.
-        if result.status == 200 && self.upload_type == 'resumable'
+        if result.status == 200 && self.upload_type == 'resumable' && self.media
           upload = result.resumable_upload
           unless upload.complete?
             logger.debug { "#{self.class} Sending upload body" }
@@ -288,6 +287,7 @@ module Google
             raise ArgumentError, "Can not specify body & body object for simple uploads"
           end
           self.headers['Content-Type'] ||= self.media.content_type
+          self.headers['Content-Length'] ||= self.media.length.to_s
           self.body = self.media
         when "multipart"
           unless options[:body_object]