Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v diff -u -r1.27 -r1.28 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 14 May 2008 02:10:51 -0000 1.27 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 27 May 2008 02:33:14 -0000 1.28 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.129 -r1.130 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 23 May 2008 01:43:55 -0000 1.129 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 27 May 2008 02:33:14 -0000 1.130 @@ -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); } }