[Erp5-report] r38768 jm - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: jm
Date: Wed Sep 29 18:39:55 2010
New Revision: 38768

URL: http://svn.erp5.org?rev=38768&view=rev
Log:
Fix test_167_InstanceAndRelatedClassDefinedInSameBT

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=38768&r1=38767&r2=38768&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Wed Sep 29 18:39:55 2010
@@ -3363,8 +3363,7 @@ class DocumentTemplateItem(BaseTemplateI
               raise
             continue
           if self.local_file_importer_name is not None:
-            self.local_file_importer_name(name)
-            # after any import, flush all ZODB caches to force a DB reload
+            # before any import, flush all ZODB caches to force a DB reload
             # otherwise we could have objects trying to get commited while
             # holding reference to a class that is no longer the same one as
             # the class in its import location and pickle doesn't tolerate it.
@@ -3375,6 +3374,7 @@ class DocumentTemplateItem(BaseTemplateI
             # connection
             self.getPortalObject()._p_jar.db().cacheMinimize()
             gc.collect()
+            self.local_file_importer_name(name)
     else:
       BaseTemplateItem.install(self, context, trashbin, **kw)
       for id in self._archive.keys():