THRIFT-3706: added cross test support for backwards compatible multiplexed server, added c_glib testBinary, fixed a number of glib object reference issues
Client: c_glib, java
This closes #1200
diff --git a/lib/c_glib/test/testcontainertest.c b/lib/c_glib/test/testcontainertest.c
index 1cbc55c..5fc51d5 100644
--- a/lib/c_glib/test/testcontainertest.c
+++ b/lib/c_glib/test/testcontainertest.c
@@ -512,13 +512,12 @@
THRIFT_SERVER_SOCKET_ERROR_ACCEPT));
/* Free our resources */
- g_object_unref (server);
- g_object_unref (transport_factory);
- g_object_unref (protocol_factory);
- g_object_unref (server_transport);
-
- g_object_unref (processor);
- g_object_unref (handler);
+ g_clear_object (&server);
+ g_clear_object (&protocol_factory);
+ g_clear_object (&transport_factory);
+ g_clear_object (&server_transport);
+ g_clear_object (&processor);
+ g_clear_object (&handler);
/* Wait for the child process to complete and return its exit status */
g_assert (wait (&status) == pid);
@@ -527,4 +526,4 @@
return exit_status;
}
-}
\ No newline at end of file
+}