LPS-34887 Fixing logic in SocialActivity, need to decrement activity …

…count before persist
laszlocsontos · May 1, 2013 · eaa6f44 · eaa6f44
1 parent 270010b
commit eaa6f44
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/portal-impl/src/com/liferay/portlet/social/service/impl/SocialActivityLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/social/service/impl/SocialActivityLocalServiceImpl.java
@@ -341,15 +341,15 @@ userId, groupId, new Date(), className, classPK, type, extraData,
 	public void deleteActivities(AssetEntry assetEntry)
 		throws PortalException, SystemException {
 
-		socialActivityPersistence.removeByC_C(
-			assetEntry.getClassNameId(), assetEntry.getClassPK());
-
-		socialActivityCounterLocalService.deleteActivityCounters(assetEntry);
-
 		if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
 			socialActivitySetLocalService.decrementActivityCount(
 				assetEntry.getClassNameId(), assetEntry.getClassPK());
 		}
+
+		socialActivityPersistence.removeByC_C(
+			assetEntry.getClassNameId(), assetEntry.getClassPK());
+
+		socialActivityCounterLocalService.deleteActivityCounters(assetEntry);
 	}
 
 	/**
@@ -365,12 +365,12 @@ public void deleteActivities(String className, long classPK)
 
 		long classNameId = PortalUtil.getClassNameId(className);
 
-		socialActivityPersistence.removeByC_C(classNameId, classPK);
-
 		if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
 			socialActivitySetLocalService.decrementActivityCount(
 				classNameId, classPK);
 		}
+
+		socialActivityPersistence.removeByC_C(classNameId, classPK);
 	}
 
 	/**
@@ -398,6 +398,11 @@ public void deleteActivity(long activityId)
 	public void deleteActivity(SocialActivity activity)
 		throws PortalException, SystemException {
 
+		if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
+			socialActivitySetLocalService.decrementActivityCount(
+				activity.getActivitySetId());
+		}
+
 		socialActivityPersistence.remove(activity);
 
 		try {
@@ -406,11 +411,6 @@ public void deleteActivity(SocialActivity activity)
 		}
 		catch (NoSuchActivityException nsae) {
 		}
-
-		if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
-			socialActivitySetLocalService.decrementActivityCount(
-				activity.getActivitySetId());
-		}
 	}
 
 	/**
@@ -434,24 +434,24 @@ public void deleteUserActivities(long userId)
 				userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 
 		for (SocialActivity activity : activities) {
-			socialActivityPersistence.remove(activity);
-
 			if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
 				socialActivitySetLocalService.decrementActivityCount(
 					activity.getActivitySetId());
 			}
+
+			socialActivityPersistence.remove(activity);
 		}
 
 		activities = socialActivityPersistence.findByReceiverUserId(
 			userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 
 		for (SocialActivity activity : activities) {
-			socialActivityPersistence.remove(activity);
-
 			if (PropsValues.SOCIAL_ACTIVITY_SETS_ENABLED) {
 				socialActivitySetLocalService.decrementActivityCount(
 					activity.getActivitySetId());
 			}
+
+			socialActivityPersistence.remove(activity);
 		}
 
 		socialActivityCounterLocalService.deleteActivityCounters(