inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84121: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82508: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82319: Merged DEV to V4.1-BUG-FIX (4.1.10)
            81073 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Initial commit to revert fixes for MNT-8527 (r48757) and MNT-9483 (r56137) as this fixes causes performance issue for Oracle.
            81966 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Default value for feed_user_id and site_network is now @@NULL@@.
               - IS NULL clause was completly removed from activities queries.
               - Upgrade sql script was added to replace nulls for Oracle (empty strings for other dialect) with @@NULL@@.
               - Version schema was incremented by 1.
            82278 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Fixed unit test failure. 
      83431: MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
         - Fixed build failure
      84115: MNT-9532/MNT-11871: with the revert of MNT-11871 patch, MNT-9532 should be using a lower schema number.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:26:23 +00:00
parent 862e07f3e2
commit 2b5e64a359
15 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/domain/activities/FeedControlEntity.java
View File

@@ -28,8 +28,8 @@ import org.alfresco.service.cmr.activities.FeedControl;
public class FeedControlEntity
{
private Long id; // internal DB-generated id
private String feedUserId;
private String siteNetwork;
private String feedUserId = ActivitiesDAO.KEY_ACTIVITY_NULL_VALUE;
private String siteNetwork = ActivitiesDAO.KEY_ACTIVITY_NULL_VALUE;
private String appTool;
private Date lastModified; // when inserted
@@ -44,13 +44,22 @@ public class FeedControlEntity
public FeedControlEntity(String feedUserId)
{
this.feedUserId = feedUserId;
if (feedUserId != null && feedUserId.length() > 0)
{
this.feedUserId = feedUserId;
}
}
public FeedControlEntity(String feedUserId, FeedControl feedControl)
{
this.feedUserId = feedUserId;
this.siteNetwork = feedControl.getSiteId();
if (feedUserId != null && feedUserId.length() > 0)
{
this.feedUserId = feedUserId;
}
if (feedControl.getSiteId() != null && feedControl.getSiteId().length() > 0)
{
this.siteNetwork = feedControl.getSiteId();
}
this.appTool = feedControl.getAppToolId();
this.lastModified = new Date();
}
@@ -77,7 +86,10 @@ public class FeedControlEntity
public void setSiteNetwork(String siteNetwork)
{
this.siteNetwork = siteNetwork;
if (siteNetwork != null && siteNetwork.length() > 0)
{
this.siteNetwork = siteNetwork;
}
}
public String getAppTool()
@@ -97,7 +109,10 @@ public class FeedControlEntity
public void setFeedUserId(String feedUserId)
{
this.feedUserId = feedUserId;
if (feedUserId != null && feedUserId.length() > 0)
{
this.feedUserId = feedUserId;
}
}
public Date getLastModified()