From: Naoki Kambe <kambe@jprs.co.jp>
Date: Mon, 24 Sep 2012 04:22:07 +0000 (+0900)
Subject: [2222] removed checking self._counter_xfrrej isn't `None`
X-Git-Tag: trac2351_base~44^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6832161c3fc10de0239da3ddb47e7261413615;p=thirdparty%2Fkea.git

[2222] removed checking self._counter_xfrrej isn't `None`

Because self._counter_xfrrej is no longer assigned to `None` as a
default in the constructor.
---

diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 90eca66c3b..ef536c875c 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -278,9 +278,8 @@ class XfroutSession():
                          format_zone_str(zone_name, zone_class))
             return None, None
         elif acl_result == REJECT:
-            if self._counter_xfrrej is not None:
-                # count rejected Xfr request by each zone name
-                self._counter_xfrrej(zone_name.to_text())
+            # count rejected Xfr request by each zone name
+            self._counter_xfrrej(zone_name.to_text())
             logger.debug(DBG_XFROUT_TRACE, XFROUT_QUERY_REJECTED,
                          self._request_type, format_addrinfo(self._remote),
                          format_zone_str(zone_name, zone_class))