From 355cfd4f95c9e3ea4c130ca3054590963d4ce7ed Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 18 Aug 2011 17:10:14 +0000 Subject: [PATCH] Part of ALF-9957: MT: test and fix subscriptions. Added null checks from count queries. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29894 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../subscriptions/ibatis/SubscriptionsDAOImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java b/source/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java index 06ee49df47..31e5e7e3d4 100644 --- a/source/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java @@ -135,8 +135,7 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO map.put("false", Boolean.FALSE); Number count = (Number) template.selectOne("alfresco.subscriptions.select_countSubscriptions", map); - - return count.intValue(); + return count == null ? 0 : count.intValue(); } @Override @@ -165,7 +164,8 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO se.setUserNodeId(userPair.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); } @@ -226,7 +226,8 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO se.setUserNodeId(userPair.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 @@ -336,7 +337,6 @@ public class SubscriptionsDAOImpl extends AbstractSubscriptionsDAO map.put("false", Boolean.FALSE); Number count = (Number) template.selectOne("alfresco.subscriptions.select_countFollowers", map); - - return count.intValue(); + return count == null ? 0 : count.intValue(); } }