aboutsummaryrefslogtreecommitdiff
path: root/ruby/ext/google/protobuf_c/defs.c
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-01-13 19:05:43 -0800
committerJosh Haberman <jhaberman@gmail.com>2016-02-18 10:50:14 -0800
commit78da66698b2f4b1f2530be855cf2509dd58737ca (patch)
tree81312c23b34f1ba2114810d7a8ad2bebe3d289d4 /ruby/ext/google/protobuf_c/defs.c
parentc40f8c1f54f028b1ca73f3fb2dfdde500f94918f (diff)
downloadprotobuf-78da66698b2f4b1f2530be855cf2509dd58737ca.tar.gz
protobuf-78da66698b2f4b1f2530be855cf2509dd58737ca.tar.bz2
protobuf-78da66698b2f4b1f2530be855cf2509dd58737ca.zip
Changed Ruby to properly camelCase its JSON by default.
Diffstat (limited to 'ruby/ext/google/protobuf_c/defs.c')
-rw-r--r--ruby/ext/google/protobuf_c/defs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ruby/ext/google/protobuf_c/defs.c b/ruby/ext/google/protobuf_c/defs.c
index 7e0cd14c..96ef4953 100644
--- a/ruby/ext/google/protobuf_c/defs.c
+++ b/ruby/ext/google/protobuf_c/defs.c
@@ -243,6 +243,10 @@ void Descriptor_free(void* _self) {
if (self->fill_method) {
upb_pbdecodermethod_unref(self->fill_method, &self->fill_method);
}
+ if (self->json_fill_method) {
+ upb_json_parsermethod_unref(self->json_fill_method,
+ &self->json_fill_method);
+ }
if (self->pb_serialize_handlers) {
upb_handlers_unref(self->pb_serialize_handlers,
&self->pb_serialize_handlers);
@@ -271,6 +275,7 @@ VALUE Descriptor_alloc(VALUE klass) {
self->layout = NULL;
self->fill_handlers = NULL;
self->fill_method = NULL;
+ self->json_fill_method = NULL;
self->pb_serialize_handlers = NULL;
self->json_serialize_handlers = NULL;
self->typeclass_references = rb_ary_new();