Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u -rd20ce45baedd4ed9d3c7d3ea4705c82527a4ee26 -r2adb095d59ae592387e0a701f5bf9728281684d0
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision d20ce45baedd4ed9d3c7d3ea4705c82527a4ee26)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision 2adb095d59ae592387e0a701f5bf9728281684d0)
@@ -63,7 +63,8 @@
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
- PROPAGATION_REQUIRED
+ PROPAGATION_REQUIRED
+ PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r4817e3da1eb7dc61568fc813da2eb0cf383aec46 -r2adb095d59ae592387e0a701f5bf9728281684d0
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 4817e3da1eb7dc61568fc813da2eb0cf383aec46)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 2adb095d59ae592387e0a701f5bf9728281684d0)
@@ -2268,8 +2268,8 @@
if ( isActivityAttempted(branch) ) {
log.warn("removeGroupFromBranch: A group member has already started the branch. Unable to remove the group from the branch. Group ID was "+groupIDString);
} else {
- group.removeGroupFromBranch(branch);
- groupingDAO.update(group);
+ branch.removeGroupFromBranch(group);
+ activityDAO.update(branch);
}
}