From 5584458b2f0b69448adad2c0b64e18dcfeba28dc Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 11 Jan 2017 10:37:06 +0000
Subject: [PATCH] Merged 5.2.0 (5.2.0) to HEAD (5.2)    133996 rneamtu:
 ACE-5416: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)       133567 rneamtu:
 ACE-5639: Comment Activitiy Feed Entries made outside of site show @@NULL@@  
        - If siteInfo does not exists do not post comment related activity

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../comments/AbstractCommentsWebScript.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java b/source/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
index 080fb9497f..dd59553c6d 100644
--- a/source/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
@@ -234,14 +234,14 @@ public abstract class AbstractCommentsWebScript extends DeclarativeWebScript
 
         SiteInfo siteInfo = getSiteInfo(req, COMMENT_CREATED_ACTIVITY.equals(activityType));
 
-        // post an activity item, but only if we've got a site
-        if (siteInfo != null)
-        {
-            siteId = siteInfo.getShortName();
-            if (siteId == null || siteId.length() == 0)
-            {
-                return;
-            }
+        // post an activity item, but only if we've got a site
+        if (siteInfo == null || siteInfo.getShortName() == null || siteInfo.getShortName().length() == 0)
+        {
+            return;
+        }
+        else
+        {
+            siteId = siteInfo.getShortName();
         }
 
         // json is not sent null with this activity type - only for delete