You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/07/19 13:16:31 UTC
svn commit: r1504831 -
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
Author: vdegtyarev
Date: Fri Jul 19 11:16:31 2013
New Revision: 1504831
URL: http://svn.apache.org/r1504831
Log:
OPENMEETINGS-703 minor changes.
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1504831&r1=1504830&r2=1504831&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Fri Jul 19 11:16:31 2013
@@ -267,15 +267,17 @@ public class AppointmentDao {
r.setNumberOfPartizipants(cfgDao.getConfValue("calendar.conference.rooms.default.size", Long.class, "50"));
}
roomDao.update(r, userId);
- for (MeetingMember mm : a.getMeetingMember()){
- if (mm.getMeetingMemberId() == null){
- if (mm.getUserid().getUser_id() == null){
- User u = mm.getUserid();
- em.persist(u);
+ if (a.getMeetingMember() != null){
+ for (MeetingMember mm : a.getMeetingMember()){
+ if (mm.getMeetingMemberId() == null){
+ if (mm.getUserid().getUser_id() == null){
+ User u = mm.getUserid();
+ em.persist(u);
+ }
+ em.persist(mm);
+ } else {
+ em.merge(mm);
}
- em.persist(mm);
- } else {
- em.merge(mm);
}
}
if (a.getAppointmentId() == null) {