BIND 10 trac2225, updated. 9ef7a4a4251aadb33bdc812403a8aadd134a28ce [2225] Merge branch 'trac2222' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2225

[BIND 10 source code commits]

The branch, trac2225 has been updated
       via  9ef7a4a4251aadb33bdc812403a8aadd134a28ce (commit)
       via  87e52b48844ab6e51b2b7e811eae8d8913e4a982 (commit)
      from  ad05f3db1d7e3269b2255005703b23b655b4f700 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9ef7a4a4251aadb33bdc812403a8aadd134a28ce
Merge: ad05f3d 87e52b4
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 12 13:15:02 2012 +0900

    [2225] Merge branch 'trac2222' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2225
    
    Conflicts:
    	src/bin/xfrout/tests/xfrout_test.py.in
    	src/bin/xfrout/xfrout.py.in

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/statistics/counter.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/statistics/counter.py b/src/lib/python/isc/statistics/counter.py
index f6e9eab..00e81f8 100644
--- a/src/lib/python/isc/statistics/counter.py
+++ b/src/lib/python/isc/statistics/counter.py
@@ -101,15 +101,15 @@ class XfroutCounter(Counter):
 
     def __init__(self, module_spec):
         Counter.__init__(self, module_spec)
-        self._xfrrunning_names = [ \
-            n for n in \
-                isc.config.spec_name_list(self._statistics_spec) \
-                if 'xfr_running' in n ]
+        self._xfrrunning_names = [
+            n for n in isc.config.spec_name_list\
+                (self._statistics_spec) \
+                if n.find('xfr_running') == 1 ]
         self._unixsocket_names = [ \
             n.split('/')[-1] for n in \
                 isc.config.spec_name_list(\
                 self._statistics_spec, "", True) \
-                if 'socket/unixdomain/' in n ]
+                if n.find('socket/unixdomain/') == 0 ]
         self._create_perzone_functors()
         self._create_xfrrunning_functors()
         self._create_unixsocket_functors()