projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1e4db58
)
Merge branch 'collectd-4.7'
author
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:53:07 +0000
(10:53 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:53:07 +0000
(10:53 +0200)
src/java.c
patch
|
blob
|
history
diff --git
a/src/java.c
b/src/java.c
index
e029a0b
..
87b189f
100644
(file)
--- a/
src/java.c
+++ b/
src/java.c
@@
-2410,6
+2410,7
@@
static int cjni_config_callback (oconfig_item_t *ci) /* {{{ */
memcpy (config_block->children + config_block->children_num,
ci_copy->children,
ci_copy->children_num * sizeof (*ci_copy->children));
+ config_block->children_num += ci_copy->children_num;
/* Delete the pointers from the copy, so `oconfig_free' can't free them. */
memset (ci_copy->children, 0,