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 DEV/SWIFT to HEAD

Browse Source 
25641: ALF-5260 - MyBatis: part IX - fix HierarchicalSqlSessionFactoryBeanTest + cleanup
          - fix test + update test resources (and remove temp files)
          - update alfresco-SqlMapConfig (and remove temp file)
   25696: MBatis: workaround fix for #179
          - intermittent ActivityService error on startup (... "Mapped Statements collection already contains value for" ...)
   26119: Fixes for ALF-7551: Upgarde from 2.1.7 -> SWIFT fails with MyBatis migration issues
          - missing resultType and incorrect parameter definitions (using iBatis #woof# and not myBatis #{woof} )


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-05-24 06:19:00 +00:00
parent 682d24d191
commit 326e3cc9c7
6 changed files with 174 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
View File

@@ -36,11 +36,11 @@ public class ActivityPostDAOImpl extends ActivitiesDAOImpl implements ActivityPo
(activityPost.getMaxId() != -1) &&
(activityPost.getStatus() != null))
{
return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts", activityPost);
return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_params", activityPost);
}
else if (activityPost.getStatus() != null)
{
return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_status_only", activityPost);
return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_status", activityPost);
}
else
{