diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-01 14:56:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 14:56:08 -0700 |
| commit | 21fc01b63c7f60bae4e230c817a82bd8571a4a70 (patch) | |
| tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /ruby/ext/google/protobuf_c/encode_decode.c | |
| parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
| parent | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (diff) | |
| download | protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.gz protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.bz2 protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.zip | |
Merge pull request #4991 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'ruby/ext/google/protobuf_c/encode_decode.c')
| -rw-r--r-- | ruby/ext/google/protobuf_c/encode_decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/encode_decode.c b/ruby/ext/google/protobuf_c/encode_decode.c index c7a7aa1a..d5842051 100644 --- a/ruby/ext/google/protobuf_c/encode_decode.c +++ b/ruby/ext/google/protobuf_c/encode_decode.c @@ -1109,7 +1109,7 @@ static void putmsg(VALUE msg_rb, const Descriptor* desc, TypedData_Get_Struct(msg_rb, MessageHeader, &Message_type, msg); if (desc != msg->descriptor) { - rb_raise(cTypeError, + rb_raise(rb_eArgError, "The type of given msg is '%s', expect '%s'.", upb_msgdef_fullname(msg->descriptor->msgdef), upb_msgdef_fullname(desc->msgdef)); |