Index: lams_bb_integration/RELEASE_NOTES.TXT
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/RELEASE_NOTES.TXT,v
diff -u -r1.36 -r1.37
--- lams_bb_integration/RELEASE_NOTES.TXT	17 Aug 2016 14:57:41 -0000	1.36
+++ lams_bb_integration/RELEASE_NOTES.TXT	23 Nov 2016 12:43:07 -0000	1.37
@@ -133,3 +133,4 @@
 * LDEV-3927: Fixed a FF bug: "Open Lesson" not open in firefox browser for the second time after closing the opened window
 * LDEV-3510: Remove previously added line that made LAMS Lessons always appear at top of content list
 * LDEV-3958: Add a button to admin page that can fix grade center columns
+* LDEV-4080: Blackboard sends _course_id instead of courseId string to LAMS on creating new lessons
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java,v
diff -u -r1.5 -r1.6
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java	22 Nov 2016 17:46:02 -0000	1.5
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java	23 Nov 2016 12:43:07 -0000	1.6
@@ -249,11 +249,11 @@
 	// create a new thread to pre-add students and monitors to a lesson (in order to do this task in parallel not to
 	// slow down later work)
 	final User userFinal = user;
-	final String courseIdStrFinal = _course_id;
+	final Course courseFinal = course;
 	Thread preaddLearnersMonitorsThread = new Thread(new Runnable() {
 	    @Override
 	    public void run() {
-		LamsSecurityUtil.preaddLearnersMonitorsToLesson(userFinal, courseIdStrFinal, LamsLessonIdLong);
+		LamsSecurityUtil.preaddLearnersMonitorsToLesson(userFinal, courseFinal, LamsLessonIdLong);
 	    }
 	}, "LAMS_preaddLearnersMonitors_thread");
 	preaddLearnersMonitorsThread.start();
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java,v
diff -u -r1.3 -r1.4
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java	22 Aug 2016 14:10:01 -0000	1.3
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java	23 Nov 2016 12:43:07 -0000	1.4
@@ -664,7 +664,7 @@
      * @param lessonId
      *            the lesoon id that was just started
      */
-    public static void preaddLearnersMonitorsToLesson(User user, String courseIdStr, long lessonId) {
+    public static void preaddLearnersMonitorsToLesson(User user, Course course, long lessonId) {
 	String serverId = getServerID();
 	String serverAddr = getServerAddress();
 	String serverKey = getServerKey();
@@ -693,7 +693,7 @@
 	    BbPersistenceManager bbPm = PersistenceServiceFactory.getInstance().getDbPersistenceManager();
 	    CourseMembershipDbLoader courseMemLoader = CourseMembershipDbLoader.Default.getInstance();
 
-	    Id courseId = bbPm.generateId(Course.DATA_TYPE, courseIdStr);
+	    Id courseId = course.getId();
 	    BbList<CourseMembership> studentCourseMemberships = courseMemLoader.loadByCourseIdAndRole(courseId,
 		    CourseMembership.Role.STUDENT, null, true);
 	    for (CourseMembership courseMembership : studentCourseMemberships) {
@@ -754,7 +754,7 @@
 	    String serviceURL = serverAddr + "/services/xml/LessonManager?" + "&serverId="
 		    + URLEncoder.encode(serverId, "utf8") + "&datetime=" + timestamp + "&username="
 		    + URLEncoder.encode(username, "utf8") + "&hashValue=" + hash + "&courseId="
-		    + URLEncoder.encode(courseIdStr, "utf8") + "&lsId=" + lessonId + "&country=" + country + "&lang="
+		    + URLEncoder.encode(course.getCourseId(), "utf8") + "&lsId=" + lessonId + "&country=" + country + "&lang="
 		    + lang + "&method=join" + "&firstNames="
 		    + firstNames + "&lastNames=" + lastNames + "&emails=" + emails;
 	    if (!monitorIds.isEmpty()) {