Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java,v
diff -u -r1.4 -r1.5
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java	26 Apr 2017 11:36:25 -0000	1.4
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java	22 May 2017 23:44:29 -0000	1.5
@@ -236,11 +236,6 @@
         String strStartDate = request.getParameter("lessonAvailability_start_datetime");
         String strEndDate = request.getParameter("lessonAvailability_end_datetime");
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar startDate = Calendar.getInstance();
-		Calendar endDate = Calendar.getInstance();
-        startDate.setTime(formatter.parse(strStartDate));
-        endDate.setTime(formatter.parse(strEndDate));
-        
         String strStartDateCheckbox = request.getParameter("lessonAvailability_start_checkbox");
         String strEndDateCheckbox = request.getParameter("lessonAvailability_end_checkbox");
         
@@ -266,27 +261,21 @@
         bbContent.setBody(description);
     
         // Set Availability Dates
-        // Clear the date (set to null) if the checkbox is unchecked
-        // Start Date
-        if (strStartDateCheckbox != null){
-            if (strStartDateCheckbox.equals("1")){
-                bbContent.setStartDate(startDate);
-            } else {
-                bbContent.setStartDate(null);
-            }
-        } else {
-            bbContent.setStartDate(null);
-        }
+	// Clear the date (set to null) if the checkbox is unchecked
+	// Start Date
+	Calendar startDate = null;
+	if (strStartDateCheckbox != null && strStartDateCheckbox.equals("1")) {
+	    startDate = Calendar.getInstance();
+	    startDate.setTime(formatter.parse(strStartDate));
+	}
+        bbContent.setStartDate(startDate);
         // End Date
-        if (strEndDateCheckbox != null){
-            if (strEndDateCheckbox.equals("1")){
-                bbContent.setEndDate(endDate);
-            } else {
-                bbContent.setEndDate(null);
-            }
-        } else {
-            bbContent.setEndDate(null);
-        }
+	Calendar endDate = null;
+	if (strEndDateCheckbox != null && (strEndDateCheckbox.equals("1"))) {
+	    endDate = Calendar.getInstance();
+	    endDate.setTime(formatter.parse(strEndDate));
+	}
+	bbContent.setEndDate(endDate);
 
         //Persist the Modified Lesson Object in Blackboard    
         ContentDbPersister persister= (ContentDbPersister) bbPm.getPersister( ContentDbPersister.TYPE );