[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server - dual_mode_channel.py:1.1.2.9

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Server
In directory cvs.zope.org:/tmp/cvs-serv13171/lib/python/Zope/Server

Modified Files:
      Tag: Zope-3x-branch
	dual_mode_channel.py 
Log Message:
Reverted to creating the main select trigger unconditionally, since
the first call to a newly created trigger has no effect and can make
the user wait for 30 seconds or so.


=== Zope3/lib/python/Zope/Server/dual_mode_channel.py 1.1.2.8 => 1.1.2.9 ===
 
 
+# Create the main trigger if it doesn't exist yet.
+if select_trigger.the_trigger is None:
+    select_trigger.the_trigger = select_trigger.trigger()
+
+
 # copy_bytes controls the size of temp. strings for shuffling data around.
 COPY_BYTES = 1 << 18  # 64K
 
@@ -51,11 +56,7 @@
             # Use the trigger from the socket map.
             pull_trigger()
         else:
-            t = select_trigger.the_trigger
-            if t is None:
-                t = select_trigger.trigger()
-                select_trigger.the_trigger = t
-            t.pull_trigger()
+            select_trigger.the_trigger.pull_trigger()
 
 
 class ASMTrigger (AlternateSocketMapMixin, select_trigger.trigger):