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

Part of ALF-9957: MT: test and fix subscriptions. Added null checks from count queries.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29894 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-08-18 17:10:14 +00:00
parent 53778ee973
commit 355cfd4f95
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java
View File

@@ -135,8 +135,7 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO
map.put("false", Boolean.FALSE); map.put("false", Boolean.FALSE);
Number count = (Number) template.selectOne("alfresco.subscriptions.select_countSubscriptions", map); Number count = (Number) template.selectOne("alfresco.subscriptions.select_countSubscriptions", map);
return count == null ? 0 : count.intValue();
return count.intValue();
} }
@Override @Override
@@ -165,7 +164,8 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO
se.setUserNodeId(userPair.getFirst()); se.setUserNodeId(userPair.getFirst());
se.setNodeId(nodePair.getFirst()); se.setNodeId(nodePair.getFirst());
if (((Number) template.selectOne("alfresco.subscriptions.select_hasSubscribed", se)).intValue() == 0) Number count = (Number) template.selectOne("alfresco.subscriptions.select_hasSubscribed", se);
if (count == null || count.intValue() == 0)
{ {
template.insert("alfresco.subscriptions.insert_Subscription", se); template.insert("alfresco.subscriptions.insert_Subscription", se);
} }
@@ -226,7 +226,8 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO
se.setUserNodeId(userPair.getFirst()); se.setUserNodeId(userPair.getFirst());
se.setNodeId(nodePair.getFirst()); se.setNodeId(nodePair.getFirst());
return ((Number) template.selectOne("alfresco.subscriptions.select_hasSubscribed", se)).intValue() == 1; Number count = (Number) template.selectOne("alfresco.subscriptions.select_hasSubscribed", se);
return count == null ? false : count.intValue() > 0;
} }
@Override @Override
@@ -336,7 +337,6 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO
map.put("false", Boolean.FALSE); map.put("false", Boolean.FALSE);
Number count = (Number) template.selectOne("alfresco.subscriptions.select_countFollowers", map); Number count = (Number) template.selectOne("alfresco.subscriptions.select_countFollowers", map);
return count == null ? 0 : count.intValue();
return count.intValue();
} }
} }