X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-msg-json.c;h=f2922cb85b5133c69ac6e2d1ef05ab0a95fcf7d9;hb=3dbe2d3eeeec9c1d3cf82f41378b306499b9d41b;hp=b4ae51b44a5a2b6e5c95095284f1e0e7323f185f;hpb=ede362db9ea82b85a531849c21582f1692bf0d4d;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c
index b4ae51b4..f2922cb8 100644
--- a/src/afb-msg-json.c
+++ b/src/afb-msg-json.c
@@ -29,15 +29,14 @@ struct json_object *afb_msg_json_reply(const char *status, const char *info, str
 {
 	json_object *msg, *request;
 	const char *token, *uuid;
-	static json_object *type_reply = NULL;
+	json_object *type_reply = NULL;
 
 	msg = json_object_new_object();
 	if (resp != NULL)
 		json_object_object_add(msg, "response", resp);
 
-	if (type_reply == NULL)
-		type_reply = json_object_new_string("afb-reply");
-	json_object_object_add(msg, "jtype", json_object_get(type_reply));
+	type_reply = json_object_new_string("afb-reply");
+	json_object_object_add(msg, "jtype", type_reply);
 
 	request = json_object_new_object();
 	json_object_object_add(msg, "request", request);
@@ -75,7 +74,7 @@ struct json_object *afb_msg_json_reply_error(const char *status, const char *inf
 struct json_object *afb_msg_json_event(const char *event, struct json_object *object)
 {
 	json_object *msg;
-	static json_object *type_event = NULL;
+	json_object *type_event = NULL;
 
 	msg = json_object_new_object();
 
@@ -84,9 +83,8 @@ struct json_object *afb_msg_json_event(const char *event, struct json_object *ob
 	if (object != NULL)
 		json_object_object_add(msg, "data", object);
 
-	if (type_event == NULL)
-		type_event = json_object_new_string("afb-event");
-	json_object_object_add(msg, "jtype", json_object_get(type_event));
+	type_event = json_object_new_string("afb-event");
+	json_object_object_add(msg, "jtype", type_event);
 
 	return msg;
 }
@@ -109,12 +107,7 @@ struct afb_arg afb_msg_json_get_arg(struct json_object *object, const char *name
 
 struct json_object *afb_msg_json_internal_error()
 {
-	static struct json_object *obj;
-
-	if (obj == NULL)
-		obj = afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
-
-	return obj;
+	return afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
 }