aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/res_odbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index d58864da0..d0580d4cb 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -697,7 +697,6 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
ast_mutex_init(&obj->lock);
/* obj inherits the outstanding reference to class */
obj->parent = class;
- class = NULL;
if (odbc_obj_connect(obj) == ODBC_FAIL) {
ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
ao2_ref(obj, -1);
@@ -706,6 +705,7 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
obj->used = 1;
ao2_link(class->obj_container, obj);
}
+ class = NULL;
} else {
/* Object is not constructed, so delete outstanding reference to class. */
ao2_ref(class, -1);
@@ -733,7 +733,6 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
ast_mutex_init(&obj->lock);
/* obj inherits the outstanding reference to class */
obj->parent = class;
- class = NULL;
if (odbc_obj_connect(obj) == ODBC_FAIL) {
ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
ao2_ref(obj, -1);
@@ -741,6 +740,7 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
} else {
ao2_link(class->obj_container, obj);
}
+ class = NULL;
}
}