From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 22 Feb 2013 18:29:34 +0000 (-0800)
Subject: [2689] corrected conflict resolution on merge.
X-Git-Tag: bind10-1.1.0beta1-release~76^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fa16c71cbffab13bcdeb311a1e81a29f107d647;p=thirdparty%2Fkea.git

[2689] corrected conflict resolution on merge.

I kept the wrong version of the code.
---

diff --git a/src/bin/stats/stats.py.in b/src/bin/stats/stats.py.in
index 51bbf96c49..577afe60af 100755
--- a/src/bin/stats/stats.py.in
+++ b/src/bin/stats/stats.py.in
@@ -267,9 +267,16 @@ class Stats:
         # It counts the number of instances of same module by
         # examining the third value from the array result of
         # 'show_processes' of Init
-        seq = self.cc_session.group_sendmsg(
-            isc.config.ccsession.create_command("show_processes"), 'Init')
-        (answer, env) = self.cc_session.group_recvmsg(False, seq)
+        try:
+            value = self.mccs.rpc_call('show_processes', 'Init')
+        except isc.config.RPCRecipientMissing:
+            # This has been SessionTimeout before, so we keep the original
+            # behavior.
+            raise
+        except isc.config.RPCError:
+            # TODO: Is it OK to just pass? As part of refactoring, preserving
+            # the original behaviour.
+            value = None
         modules = []
         if type(value) is list:
             # NOTE: For example, the "show_processes" command