From: Tomas M. <to...@us...> - 2009-01-15 20:15:41
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23488/JavaSource/org/unitime/timetable/model Modified Files: Session.java Log Message: Fixed NullPointerException thrown when eventBeginTime/eventEndTime is not set Index: Session.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/Session.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Session.java 5 Aug 2008 20:03:44 -0000 1.15 --- Session.java 15 Jan 2009 20:15:30 -0000 1.16 *************** *** 547,554 **** Calendar eventBeginDate = Calendar.getInstance(Locale.US); ! if (eventBeginDate!=null) eventBeginDate.setTime(eventBeginTime); Calendar eventEndDate = Calendar.getInstance(Locale.US); ! if (eventEndDate!=null) eventEndDate.setTime(eventEndTime); int startMonth = DateUtils.getStartMonth(eventBeginTime!=null?eventBeginTime:sessionBeginTime, acadYear, sNrExcessDays); --- 547,554 ---- Calendar eventBeginDate = Calendar.getInstance(Locale.US); ! if (eventBeginTime!=null) eventBeginDate.setTime(eventBeginTime); Calendar eventEndDate = Calendar.getInstance(Locale.US); ! if (eventEndTime!=null) eventEndDate.setTime(eventEndTime); int startMonth = DateUtils.getStartMonth(eventBeginTime!=null?eventBeginTime:sessionBeginTime, acadYear, sNrExcessDays); |