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

[solomax]

Author: solomax
Date: Wed Feb 27 10:04:48 2013
New Revision: 1450703

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

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

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=1450703&r1=1450702&r2=1450703&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:04:48 2013
@@ -115,6 +115,11 @@ public class RoomDao implements IDataPro
                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());
@@ -124,7 +129,7 @@ public class RoomDao implements IDataPro
                }
                if (entity.isSipEnabled() && isSipEnabled()) {
                        String sipNumber = getSipNumber(entity.getRooms_id());
-                       if (!sipNumber.equals(entity.getConfno())) {
+                       if (!sipNumber.equals(entity.getConfno()) || 
isPinChanged(entity, pin)) {
                                sipDao.update(sipNumber, pin);
                                entity.setConfno(sipNumber);
                                entity.setPin(pin);