Fixed cases where two distinct connections where opened for the

same connector, the same thread, within a single transaction. It
fixes some possible lock wait timeout when two distinct connections
were used instead of one.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36628 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZMySQLDA/DA.py

@@ -97,6 +97,7 @@ from App.ImageFile import ImageFile
 from ExtensionClass import Base
 from DateTime import DateTime
 from thread import allocate_lock
+from Acquisition import aq_parent
 
 manage_addZMySQLConnectionForm=HTMLFile('connectionAdd',globals())
 
@@ -123,6 +124,12 @@ class Connection(DABase.Connection):
     def factory(self): return ThreadedDB
 
     def connect(self, s):
+      # if acquisition wrappers are not there, do not connect in order to prevent
+      # having 2 distinct connections for the same connector. Without this
+      # two following lines, there is in the pool for the same connector two connections,
+      # one for (connection_id,) and another one for (some, path, connection_id,)
+      if aq_parent(self) is None:
+        return self
       try:
         database_connection_pool_lock.acquire()
         self._v_connected = ''