Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v
diff -u -r1.36.2.5 -r1.36.2.6
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	2 Mar 2007 00:06:07 -0000	1.36.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	2 Mar 2007 04:01:43 -0000	1.36.2.6
@@ -398,7 +398,7 @@
 		learningDesign.setFirstActivity(learningDesign.calculateFirstActivity());
 		learningDesignDAO.insertOrUpdate(learningDesign);
 		deleteUnwantedGroupings();
-		deleteUnwantedToolSessions();
+		deleteUnwantedToolSessions(learningDesign);
 		
 		return learningDesign;	
 		}
@@ -420,7 +420,7 @@
 	 * by Hibernate later - useful to clean up any unwanted tool sessions for edit on the fly.
 	 */
 	private void initialiseToolSessionMap(LearningDesign learningDesign) {
-//		TODO if ( editOnFly ) {
+		if (learningDesign.getEditOverrideLock() && learningDesign.getEditOverrideUser() != null) {
 			Iterator iter = learningDesign.getActivities().iterator();
 			while ( iter.hasNext() ) {
 				Activity activity = (Activity) iter.next();
@@ -429,7 +429,7 @@
 				if ( toolSessions != null && toolSessions.size() > 0 )
 					toolSessionMap.put(activity.getActivityUIID(),toolSessions);
 			}
-		// }
+		}
 	}
 
 	/** Delete the old unneeded groupings. Won't be done via a cascase */
@@ -443,8 +443,8 @@
 	 * for edit on fly. The progress engine pre-generates the tool sessions for class level activities,
 	 * so if we edit the design, we need to delete the tool sessions. If we encounter evidence that this
 	 * is a grouped activity - either more than one tool session exists or the activity is grouped, then abort. */
-	private void deleteUnwantedToolSessions() throws ObjectExtractorException {
-//		TODO if ( editOnFly ) {
+	private void deleteUnwantedToolSessions(LearningDesign learningDesign) throws ObjectExtractorException {
+		if (learningDesign.getEditOverrideLock() && learningDesign.getEditOverrideUser() != null) {
 
 			for ( Integer uiid : toolSessionMap.keySet() ) {
 				if ( ! newActivityMap.containsKey(uiid) ) {
@@ -471,7 +471,7 @@
 				}
 			}
 
-//		}
+		}
 	}
 
 	/**