default to using UTF-8 as response encoding for SOAP if none is

supplied, but if an encoding is supplied by caller, use that for the
response instead (NAKAMURA Hiroshi)


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1245 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 2 deletions

diff --git a/actionwebservice/lib/action_web_service/protocol/abstract.rb b/actionwebservice/lib/action_web_service/protocol/abstract.rb
index d8830968d0..3819aa2ade 100644
--- a/actionwebservice/lib/action_web_service/protocol/abstract.rb
+++ b/actionwebservice/lib/action_web_service/protocol/abstract.rb
@@ -17,7 +17,7 @@ module ActionWebService # :nodoc:
         request
       end
 
-      def decode_request(raw_request, service_name, protocol_options=nil)
+      def decode_request(raw_request, service_name, protocol_options={})
       end
 
       def encode_request(method_name, params, param_types)
@@ -26,7 +26,7 @@ module ActionWebService # :nodoc:
       def decode_response(raw_response)
       end
 
-      def encode_response(method_name, return_value, return_type)
+      def encode_response(method_name, return_value, return_type, protocol_options={})
       end
 
       def protocol_client(api, protocol_name, endpoint_uri, options)