[Erp5-report] r19150 - /erp5/trunk/products/CMFActivity/ActiveObject.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Feb  7 21:28:24 2008
New Revision: 19150

URL: http://svn.erp5.org?rev=19150&view=rev
Log:
Do not hide any error that may arrise from activateObject call.

Modified:
    erp5/trunk/products/CMFActivity/ActiveObject.py

Modified: erp5/trunk/products/CMFActivity/ActiveObject.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActiveObject.py?rev=19150&r1=19149&r2=19150&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActiveObject.py (original)
+++ erp5/trunk/products/CMFActivity/ActiveObject.py Thu Feb  7 21:28:24 2008
@@ -133,18 +133,7 @@
     # activate returns an ActiveWrapper
     # a queue can be provided as well as extra parameters
     # which can be used for example to define deferred tasks
-    try:
-      return activity_tool.activateObject(self, activity, active_process, **kw)
-    except ConflictError:
-      raise
-    except:
-      LOG("CMFActivity", WARNING,
-          'could not create activity for %s' % self.getRelativeUrl(),
-          error=sys.exc_info())
-      # If the portal_activities were not created
-      # return a passive object
-      if passive_commit: get_transaction().commit()
-      return self
+    return activity_tool.activateObject(self, activity, active_process, **kw)
 
   security.declareProtected( permissions.ModifyPortalContent, 'flushActivity' )
   def flushActivity(self, invoke=0, **kw):