svn commit: r1646172 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java

[solomax]

Author: solomax
Date: Wed Dec 17 08:30:36 2014
New Revision: 1646172

URL: http://svn.apache.org/r1646172
Log:
NPE in RoomForm should be fixed

Modified:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1646172&r1=1646171&r2=1646172&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 Wed Dec 17 08:30:36 2014
@@ -238,6 +238,9 @@ public class RoomForm extends AdminBaseF
                                User u = moderator2add.getObject();
                                boolean found = false;
                                if (u != null) {
+                                       if (r.getModerators() == null) {
+                                               r.setModerators(new 
ArrayList<RoomModerator>());
+                                       }
                                        for (RoomModerator rm : 
r.getModerators()) {
                                                if 
(rm.getUser().getUser_id().equals(u.getUser_id())) {
                                                        found = true;

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1646172&r1=1646171&r2=1646172&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 Wed Dec 17 08:30:36 2014
@@ -235,6 +235,9 @@ public class RoomForm extends AdminBaseF
                                User u = moderator2add.getObject();
                                boolean found = false;
                                if (u != null) {
+                                       if (r.getModerators() == null) {
+                                               r.setModerators(new 
ArrayList<RoomModerator>());
+                                       }
                                        for (RoomModerator rm : 
r.getModerators()) {
                                                if 
(rm.getUser().getId().equals(u.getId())) {
                                                        found = true;