svn commit: r1308430 - /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java

[sebawagner]

Author: sebawagner
Date: Mon Apr  2 16:51:26 2012
New Revision: 1308430

URL: http://svn.apache.org/viewvc?rev=1308430&view=rev
Log:
Fix Ldap default organization id when user is created, only add if org is 
supplied

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1308430&r1=1308429&r2=1308430&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
 Mon Apr  2 16:51:26 2012
@@ -1121,9 +1121,11 @@ public class Usermanagement {
                        users.setDeleted("false");
                        
                        //new user add organizations without checks
-                       List<Organisation_Users> orgList = 
users.getOrganisation_users();
-                       for (Long orgId : orgIds) {
-                               
orgList.add(organisationmanagement.getOrgUser(orgId, null));
+                       if (orgIds != null) {
+                               List<Organisation_Users> orgList = 
users.getOrganisation_users();
+                               for (Long orgId : orgIds) {
+                                       
orgList.add(organisationmanagement.getOrgUser(orgId, null));
+                               }
                        }
                        return addUser(users);