summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authora_matsuda <a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-08 20:25:44 +0000
committera_matsuda <a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-08 20:25:44 +0000
commit39edad0380ce78a354cb7aa7d90579e395c6f432 (patch)
tree0484ee089e95647d2ddc953dd4ccf1e09463ddbb
parentd0a633990371d8704e789dfb4eb197413f9dfeda (diff)
Fix undefined method 'dump' for nil:NilClass (NoMethodError)
Patch by: Dmitry Vorotilin <d.vorotilin@gmail.com> (@route) Signed-off-by: Akira Matsuda <ronnie@dio.jp> closes #1475 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/net/http/response.rb4
-rw-r--r--test/net/http/test_httpresponse.rb16
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index e2964c41a1..1351d7b2d2 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -117,7 +117,9 @@ class Net::HTTPResponse
end
def error! #:nodoc:
- raise error_type().new(@code + ' ' + @message.dump, self)
+ message = @code
+ message += ' ' + @message.dump if @message
+ raise error_type().new(message, self)
end
def error_type #:nodoc:
diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb
index a494b7fb85..a67add7c88 100644
--- a/test/net/http/test_httpresponse.rb
+++ b/test/net/http/test_httpresponse.rb
@@ -385,6 +385,22 @@ EOS
assert_equal(nil, res.message)
end
+ def test_raises_exception_with_missing_reason
+ io = dummy_io(<<EOS)
+HTTP/1.1 404
+Content-Length: 5
+Connection: close
+
+hello
+EOS
+
+ res = Net::HTTPResponse.read_new(io)
+ assert_equal(nil, res.message)
+ assert_raise Net::HTTPServerException do
+ res.error!
+ end
+ end
+
private
def dummy_io(str)