X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FActivity%2FBAO%2FActivity.php;h=39d28852dcc36585849b2f90b3eb36f3791a1e8c;hb=b7ff0a0a5544c5a5d510c685c8fdbdaecad7a5d0;hp=9d514c4de717806e5beb455c3bbe61a78c2d423e;hpb=e7a24fcc8e9688c9441a4a33f6a6889b31ba24ab;p=civicrm-core.git

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 9d514c4de7..39d28852dc 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -254,7 +254,13 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
     if ($recordTypeID) {
       $activityContact->record_type_id = $recordTypeID;
     }
-    $activityContact->delete();
+
+    //let's check if activity contact record exits and then delete.
+    //looks like delete leads to deadlock when multiple simultaneous
+    //requests are done. CRM-15470
+    if ($activityContact->find()) {
+      $activityContact->delete();
+    }
   }
 
   /**