svn commit: r1553691 - /openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java

[solomax]

Author: solomax
Date: Fri Dec 27 16:28:01 2013
New Revision: 1553691

URL: http://svn.apache.org/r1553691
Log:
[OPENMEETINGS-866] NPE if frontend register is not allowed is fixed

Modified:
    
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java

Modified: 
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1553691&r1=1553690&r2=1553691&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
 Fri Dec 27 16:28:01 2013
@@ -311,7 +311,7 @@ public class UserWebService {
                                                                                
        // enabled
                                                jNameTimeZone); 
 
-                               if (user_id < 0) {
+                               if (user_id == null || user_id < 0) {
                                        return user_id;
                                }
 
@@ -404,7 +404,7 @@ public class UserWebService {
                                                language_id, "", false, true, 
// generate SIP Data if the config is enabled
                                                jNameTimeZone);
 
-                               if (user_id < 0) {
+                               if (user_id == null || user_id < 0) {
                                        return user_id;
                                }