From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 17 Aug 2009 08:53:07 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~44
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0b9800153cec24ed79c71beaac265e33ee3001ba;hp=1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c;p=collectd.git

Merge branch 'collectd-4.7'
---

diff --git a/src/java.c b/src/java.c
index e029a0b1..87b189fa 100644
--- 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,