svn commit: r1371326 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app: data/calendar/management/AppointmentLogic.java remote/CalendarService.java

[solomax]

Author: solomax
Date: Thu Aug  9 17:31:52 2012
New Revision: 1371326

URL: http://svn.apache.org/viewvc?rev=1371326&view=rev
Log:
OPENMEETINGS-387 permanent room was deleted with appointment

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1371326&r1=1371325&r2=1371326&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
 Thu Aug  9 17:31:52 2012
@@ -358,7 +358,10 @@ public class AppointmentLogic {
                        appointmentDao.deleteAppointement(appointmentId);
 
                        // Deleting Room
-                       roommanagement.deleteRoom(room);
+                       boolean isAppRoom = room.getAppointment();
+                       if (isAppRoom) {
+                               roommanagement.deleteRoom(room);
+                       }
 
                        return appointmentId;
 

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java?rev=1371326&r1=1371325&r2=1371326&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
 Thu Aug  9 17:31:52 2012
@@ -240,6 +240,10 @@ public class CalendarService {
                                        if ( room.getRooms_id() != roomId) {
                                                
app.setRoom(roommanagement.getRoomById(roomId));
                                                
appointmentDao.updateAppointment(app);
+                                               boolean isAppRoom = 
room.getAppointment();
+                                               if (isAppRoom) {
+                                                       
roommanagement.deleteRoom(room);
+                                               }
                                        }
                                } else {
                                        RoomTypes rt = 
roommanagement.getRoomTypesById(roomType);