summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adamansky@gmail.com>2013-05-25 18:25:19 +0700
committeradam <adamansky@gmail.com>2013-05-25 18:25:19 +0700
commita758d4ae59695891561ade8253937e29ad54d9ed (patch)
tree639bbc5304fc7c8567cee277a699e1788781f06c
parent2c95a00f0abdcde46771209a56673b02acb634bd (diff)
downloadejdb-a758d4ae59695891561ade8253937e29ad54d9ed.tar.gz
ejdb-a758d4ae59695891561ade8253937e29ad54d9ed.tar.bz2
ejdb-a758d4ae59695891561ade8253937e29ad54d9ed.zip
fixed #63 in ejdb@1.1.6
-rw-r--r--node/ejdb_native.cc9
-rw-r--r--package.json2
-rw-r--r--tcejdb/configure.ac2
-rw-r--r--tcejdb/debian/changelog6
-rw-r--r--tcejdb/tchdb.c1
5 files changed, 17 insertions, 3 deletions
diff --git a/node/ejdb_native.cc b/node/ejdb_native.cc
index babe7c9..fc617c9 100644
--- a/node/ejdb_native.cc
+++ b/node/ejdb_native.cc
@@ -1449,7 +1449,14 @@ finish:
}
bool close() {
- return m_jb ? ejdbclose(m_jb) : false;
+ if (m_jb) {
+ ejdbclose(m_jb);
+ ejdbdel(m_jb);
+ m_jb = NULL;
+ return true;
+ } else {
+ return false;
+ }
}
const char* _jb_error_msg() {
diff --git a/package.json b/package.json
index 2c64d8d..f1d7ca1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name" : "ejdb",
- "version" : "1.1.5-0",
+ "version" : "1.1.6-0",
"config" : {
"windownloadurl_ia32" : "http://dl.dropboxusercontent.com/u/4709222/ejdb/tcejdb-1.1.3-mingw32-i686.zip",
"windownloadurl_x64" : "http://dl.dropboxusercontent.com/u/4709222/ejdb/tcejdb-1.1.3-mingw32-x86_64.zip"
diff --git a/tcejdb/configure.ac b/tcejdb/configure.ac
index 0ef5169..d91ca05 100644
--- a/tcejdb/configure.ac
+++ b/tcejdb/configure.ac
@@ -10,7 +10,7 @@ test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
# Package name
-AC_INIT(tcejdb, 1.1.5)
+AC_INIT(tcejdb, 1.1.6)
AC_CANONICAL_HOST
# Package information
diff --git a/tcejdb/debian/changelog b/tcejdb/debian/changelog
index 9963997..e14c212 100644
--- a/tcejdb/debian/changelog
+++ b/tcejdb/debian/changelog
@@ -1,3 +1,9 @@
+libtcejdb (1.1.6) testing; urgency=low
+
+ * Better error reporting in the case of lack pthread resources.
+
+ -- Anton Adamansky <adamansky@gmail.com> Sat, 25 May 2013 18:22:07 +0700
+
libtcejdb (1.1.5-0) testing; urgency=low
* TCHDB locking optimization
diff --git a/tcejdb/tchdb.c b/tcejdb/tchdb.c
index fbf2939..0c75abc 100644
--- a/tcejdb/tchdb.c
+++ b/tcejdb/tchdb.c
@@ -391,6 +391,7 @@ bool tchdbopen(TCHDB *hdb, const char *path, int omode) {
TCFREE(hdb->eckey);
hdb->eckey = NULL;
HDBUNLOCKMETHOD(hdb);
+ tchdbsetecode(hdb, TCETHREAD, __FILE__, __LINE__, __func__);
return false;
}
}