Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== diff -u -r5df58e16bd1f547101ccdc6e223ebf1bf269da22 -ra178bc65367570a2a9408c6cd5fc2585c08f51b3 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 5df58e16bd1f547101ccdc6e223ebf1bf269da22) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision a178bc65367570a2a9408c6cd5fc2585c08f51b3) @@ -1256,14 +1256,19 @@ } // now go through and delete any old branch mappings that are no longer used. - // need to remove them via the sequence activity so that the cascade will work. + // need to remove them from their collections to make sure it isn't accidently re-added. Iterator iter = oldbranchActivityEntryList.iterator(); while (iter.hasNext()) { BranchActivityEntry oldEntry = (BranchActivityEntry) iter.next(); SequenceActivity sequenceActivity = oldEntry.getBranchSequenceActivity(); if ( sequenceActivity != null ) { sequenceActivity.getBranchEntries().remove(oldEntry); } + Group group = oldEntry.getGroup(); + if (group != null ) { + group.getBranchActivities().remove(oldEntry); + } + activityDAO.delete(oldEntry); } }