Merge branch 'cm_1085202_EMailCommunicationBug' into '2021.1.2'

[Projekt: xRM-ContactManagement][TicketNr.: 1085202][EMail - Fehlermeldung...

See merge request xrm/basic!1183

process/IncomingEmailExecutor_lib/process.js

@@ -242,16 +242,17 @@ IncomingEmailExecutor.prototype.isUnlinkable = function()
  */
 IncomingEmailExecutor.getContactDataByEmail = function(pMailAddress, pAlias)
 {
-    var mailAddress = null;
+    let contactData = null;
     
     try
     {
-        mailAddress = EmailUtils.extractAddress(pMailAddress).toUpperCase();
+        let mailAddress = EmailUtils.extractAddress(pMailAddress).toUpperCase();
         
-        mailAddress = mailAddress ? newSelect("CONTACT.CONTACTID, CONTACT.STATUS, CONTACT.PERSON_ID, CONTACT.ISOLANGUAGE", pAlias)
+        contactData = mailAddress ? newSelect("CONTACT.CONTACTID, CONTACT.STATUS, CONTACT.PERSON_ID, CONTACT.ISOLANGUAGE", pAlias)
                             .from("COMMUNICATION")
-                            .join("CONTACT", newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
+                            .join("CONTACT","COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID")
                             .where("COMMUNICATION.ADDR", mailAddress, "upper(#) = ?")
+                            .and("COMMUNICATION.OBJECT_TYPE", "Contact")
                             .table()
                         : [];
     }
@@ -261,7 +262,7 @@ IncomingEmailExecutor.getContactDataByEmail = function(pMailAddress, pAlias)
         logging.log(pException, logging.ERROR);
     }
     
-    return mailAddress;
+    return contactData;
 }
 
 /**
@@ -361,10 +362,12 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks, pIsE
                prefered: [],
                 failback: []
             };
-
-            recipientsInfo.forEach(this._getProcessingFunction(false, recipientContacts), this);
-            this.activityData.links = this.activityData.links.concat(recipientContacts.prefered.length > 0 ? recipientContacts.prefered 
+            if (recipientsInfo)
+            {
+                recipientsInfo.forEach(this._getProcessingFunction(false, recipientContacts), this);
+                this.activityData.links = this.activityData.links.concat(recipientContacts.prefered.length > 0 ? recipientContacts.prefered 
                                                                     : recipientContacts.failback);
+            }
         }
     }