Instructional Offering Cross Lists: Bugfix

- fixed a Hibernate exception (persistent instance references an unsaved transient instance) that can be thrown when dropping a course that has been involved in a wait-listing swap
  (CourseDemand.waitListSwapWithCourseOffering field when unitime.crossList.keepCourseRequests is set to true)

Author: tomas-muller

JavaSource/org/unitime/timetable/server/courses/CrossListUpdateBackend.java

@@ -47,6 +47,7 @@
 import org.unitime.timetable.model.ChangeLog;
 import org.unitime.timetable.model.ClassInstructor;
 import org.unitime.timetable.model.Class_;
+import org.unitime.timetable.model.CourseDemand;
 import org.unitime.timetable.model.CourseOffering;
 import org.unitime.timetable.model.CourseRequest;
 import org.unitime.timetable.model.CurriculumCourse;
@@ -120,7 +121,7 @@ public GwtRpcResponseNull execute(CrossListUpdateRequest request, SessionContext
                     	x.getClassification().getCourses().remove(x);
                     	hibSession.remove(x);
                     }
-                    if (ApplicationProperty.ModifyCrossListKeepCourseRequests.isTrue())
+                    if (ApplicationProperty.ModifyCrossListKeepCourseRequests.isTrue()) {
                     	for (CourseRequest oldReq: hibSession.createQuery(
                     			"from CourseRequest where courseOffering.uniqueId = :courseId", CourseRequest.class)
                     			.setParameter("courseId", co1.getUniqueId()).list()) {
@@ -134,6 +135,12 @@ public GwtRpcResponseNull execute(CrossListUpdateRequest request, SessionContext
                     		courseRequests.add(newReq);
                     		hibSession.remove(oldReq);
                     	}
+                        for (CourseDemand cd: hibSession.createQuery(
+                    			"from CourseDemand where waitListSwapWithCourseOffering.uniqueId = :courseId", CourseDemand.class)
+                    			.setParameter("courseId", co1.getUniqueId()).list()) {
+                        	cd.setWaitListSwapWithCourseOffering(null);
+                        }
+                    }
 
                     List<AdvisorCourseRequest> acrs = hibSession.createQuery(
                 			"from AdvisorCourseRequest where courseOffering.uniqueId = :courseId", AdvisorCourseRequest.class)
@@ -245,7 +252,7 @@ public GwtRpcResponseNull execute(CrossListUpdateRequest request, SessionContext
                         	x.getClassification().getCourses().remove(x);
                         	hibSession.remove(x);
                         }
-                        if (ApplicationProperty.ModifyCrossListKeepCourseRequests.isTrue())
+                        if (ApplicationProperty.ModifyCrossListKeepCourseRequests.isTrue()) {
                         	for (CourseRequest oldReq: hibSession.createQuery(
                         			"from CourseRequest where courseOffering.uniqueId = :courseId", CourseRequest.class)
                         			.setParameter("courseId", co2.getUniqueId()).list()) {
@@ -259,6 +266,12 @@ public GwtRpcResponseNull execute(CrossListUpdateRequest request, SessionContext
                         		courseRequests.add(newReq);
                         		hibSession.remove(oldReq);
                         	}
+                        	for (CourseDemand cd: hibSession.createQuery(
+                        			"from CourseDemand where waitListSwapWithCourseOffering.uniqueId = :courseId", CourseDemand.class)
+                        			.setParameter("courseId", co2.getUniqueId()).list()) {
+                            	cd.setWaitListSwapWithCourseOffering(null);
+                            }
+                        }
 
                         List<AdvisorCourseRequest> acrs = hibSession.createQuery(
                     			"from AdvisorCourseRequest where courseOffering.uniqueId = :courseId", AdvisorCourseRequest.class)

WebContent/help/Release-Notes.xml

@@ -28,6 +28,15 @@
 <release>
 	<version>4.9.${build.number}</version>
 	<release-date>${build.date}</release-date>
+	<category>
+		<title>Course Timetabling</title>
+		<item>
+			<name>Instructional Offering Cross Lists: Bugfix</name>
+			<description>
+				<line>Fixed a Hibernate exception (persistent instance references an unsaved transient instance) that can be thrown when dropping a course that has been involved in a wait-listing swap.</line>
+			</description>
+		</item>
+	</category>
 	<category>
 		<title>Administration</title>
 		<item>