[svn] commit: r1861 - /branches/trac185/src/bin/xfrin/xfrin.py.in

[BIND 10 source code commits]

Author: jinmei
Date: Wed May 19 19:03:20 2010
New Revision: 1861

Log:
refactoring: consolidate code logic for retransfer and refresh.
(there's no behavior change)

Modified:
    branches/trac185/src/bin/xfrin/xfrin.py.in

Modified: branches/trac185/src/bin/xfrin/xfrin.py.in
==============================================================================
--- branches/trac185/src/bin/xfrin/xfrin.py.in (original)
+++ branches/trac185/src/bin/xfrin/xfrin.py.in Wed May 19 19:03:20 2010
@@ -376,15 +376,10 @@
             if cmd == 'shutdown':
                 self._shutdown_event.set()
 
-            elif cmd == 'retransfer':
-                zone_name, master_addrinfo, db_file = self._parse_cmd_params(args)
-                ret = self.xfrin_start(zone_name, db_file, master_addrinfo,
-                                       False)
-                answer = create_answer(ret[0], ret[1])
-
-            elif cmd == 'refresh':
-                zone_name, master_addrinfo, db_file = self._parse_cmd_params(args)
-                ret = self.xfrin_start(zone_name, db_file, master_addrinfo)
+            elif cmd == 'retransfer' or cmd == 'refresh':
+                zone_name, master_addr, db_file = self._parse_cmd_params(args)
+                ret = self.xfrin_start(zone_name, db_file, master_addr,
+                                       False if cmd == 'retransfer' else True)
                 answer = create_answer(ret[0], ret[1])
 
         except XfrinException as err: