svn commit: r1450708 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference: RoomManager.java dao/RoomDao.java

[solomax]

Author: solomax
Date: Wed Feb 27 10:17:35 2013
New Revision: 1450708

URL: http://svn.apache.org/r1450708
Log:
SIP: pin was not saved for existing room

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1450708&r1=1450707&r2=1450708&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
 Wed Feb 27 10:17:35 2013
@@ -651,8 +651,9 @@ public class RoomManager {
                                r.setFilesOpened(filesOpened);
                                r.setAutoVideoSelect(autoVideoSelect);
                                r.setSipEnabled(sipEnabled);
+                               r.setPin(conferencePin);
                                
-                               r = roomDao.update(r, ownerId, conferencePin);
+                               r = roomDao.update(r, ownerId);
 
                                if (organisations != null) {
                                        Long t = 
this.updateRoomOrganisations(organisations, r);
@@ -1227,6 +1228,7 @@ public class RoomManager {
                        r.setChatOpened(chatOpened);
                        r.setFilesOpened(filesOpened);
                        r.setAutoVideoSelect(autoVideoSelect);
+                       r.setPin(conferencePin);
                        r.setSipEnabled(sipEnabled);
                        roomDao.update(r, ownerId);
 

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1450708&r1=1450707&r2=1450708&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
 Wed Feb 27 10:17:35 2013
@@ -112,15 +112,6 @@ public class RoomDao implements IDataPro
        }
        
        public Room update(Room entity, Long userId) {
-               return update(entity, userId, null);
-       }
-       
-       private boolean isPinChanged(Room entity, String pin) {
-               return (pin == null && entity.getPin() != null)
-                               || !pin.equals(entity.getPin());
-       }
-       
-       public Room update(Room entity, Long userId, String pin) {
                if (entity.getRooms_id() == null) {
                        entity.setStarttime(new Date());
                        em.persist(entity);
@@ -129,11 +120,10 @@ public class RoomDao implements IDataPro
                }
                if (entity.isSipEnabled() && isSipEnabled()) {
                        String sipNumber = getSipNumber(entity.getRooms_id());
-                       if (!sipNumber.equals(entity.getConfno()) || 
isPinChanged(entity, pin)) {
-                               sipDao.update(sipNumber, pin);
+                       if (!sipNumber.equals(entity.getConfno())) {
                                entity.setConfno(sipNumber);
-                               entity.setPin(pin);
                        }
+                       sipDao.update(sipNumber, entity.getPin());
                } else {
                        sipDao.delete(entity.getConfno());
                        entity.setConfno(null);