Merge pull request #765 from KoolSpan/master

RestAPI plugin, synchronizing invalid room state when creating a room in a clustered Openfire

src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java

@@ -246,11 +246,6 @@ public class MUCRoomController {
 		room.setMembersOnly(mucRoomEntity.isMembersOnly());
 		room.setModerated(mucRoomEntity.isModerated());
 
-		// Fire RoomUpdateEvent if cluster is started
-		if (ClusterManager.isClusteringStarted()) {
-		  CacheFactory.doClusterTask(new RoomUpdatedEvent((LocalMUCRoom) room));
-		}
-
 		// Set broadcast presence roles
 		if (mucRoomEntity.getBroadcastPresenceRoles() != null) {
 			room.setRolesToBroadcastPresence(mucRoomEntity.getBroadcastPresenceRoles());
@@ -277,6 +272,11 @@ public class MUCRoomController {
 		// Unlock the room, because the default configuration lock the room.  		
 		room.unlock(room.getRole());
 		
+		// Fire RoomUpdateEvent if cluster is started
+		if (ClusterManager.isClusteringStarted()) {
+		  CacheFactory.doClusterTask(new RoomUpdatedEvent((LocalMUCRoom) room));
+		}
+
 		// Save the room to the DB if the room should be persistant
 		if (room.isPersistent()) {
 			room.saveToDB();