projects
/
platform
/
upstream
/
ejdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5424211
)
#88 minors
author
adam
<adamansky@gmail.com>
Thu, 1 Aug 2013 18:33:39 +0000
(
01:33
+0700)
committer
adam
<adamansky@gmail.com>
Thu, 1 Aug 2013 18:33:39 +0000
(
01:33
+0700)
tcejdb/bson.c
patch
|
blob
|
history
diff --git
a/tcejdb/bson.c
b/tcejdb/bson.c
index
93f7016
..
139484c
100644
(file)
--- a/
tcejdb/bson.c
+++ b/
tcejdb/bson.c
@@
-1454,7
+1454,7
@@
static bson_visitor_cmd_t _bson_merge3_visitor(const char *ipath, int ipathlen,
const void *buf;
int bufsz;
bson_type bt = bson_iterator_type(it);
- buf = (TCMAPRNUM(ctx->mfields) == 0) ? NULL : tcmapget(ctx->mfields, ipath, ipathlen, &bufsz);
+ buf = (TCMAPRNUM(ctx->mfields) == 0
|| after
) ? NULL : tcmapget(ctx->mfields, ipath, ipathlen, &bufsz);
if (buf) {
bson_iterator it2;
bson_iterator_from_buffer(&it2, ctx->bsdata2);