diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-18 15:10:02 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-18 15:10:02 +1000 |
| commit | 4f0e70b66182cbb872c4e5eefda23f1c58bdaab7 (patch) | |
| tree | a32874e94f24d545e205e05d71916877525f85a7 /src/third_party/wiredtiger/src/conn/conn_open.c | |
| parent | 727c1dc8ce2df4e44516e1527d917294f7c45558 (diff) | |
| download | mongo-4f0e70b66182cbb872c4e5eefda23f1c58bdaab7.tar.gz | |
Import wiredtiger-wiredtiger-2.6.0-19-g35cc116.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_open.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_open.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_open.c b/src/third_party/wiredtiger/src/conn/conn_open.c index ff3ad7a67f7..9cae1c5c4d1 100644 --- a/src/third_party/wiredtiger/src/conn/conn_open.c +++ b/src/third_party/wiredtiger/src/conn/conn_open.c @@ -138,6 +138,7 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn) WT_TRET(__wt_conn_remove_collator(session)); WT_TRET(__wt_conn_remove_compressor(session)); WT_TRET(__wt_conn_remove_data_source(session)); + WT_TRET(__wt_conn_remove_encryptor(session)); WT_TRET(__wt_conn_remove_extractor(session)); /* @@ -196,18 +197,16 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn) * now. */ if ((s = conn->sessions) != NULL) - for (i = 0; i < conn->session_size; ++s, ++i) - if (s != session) { - /* - * If hash arrays were allocated, - * free them now. - */ - if (s->dhhash != NULL) - __wt_free(session, s->dhhash); - if (s->tablehash != NULL) - __wt_free(session, s->tablehash); - __wt_free(session, s->hazard); - } + for (i = 0; i < conn->session_size; ++s, ++i) { + /* + * If hash arrays were allocated, free them now. + */ + if (s->dhhash != NULL) + __wt_free(session, s->dhhash); + if (s->tablehash != NULL) + __wt_free(session, s->tablehash); + __wt_free(session, s->hazard); + } /* Destroy the handle. */ WT_TRET(__wt_connection_destroy(conn)); |