svn commit: r1526799 - in /openmeetings: branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java

[solomax]

Author: solomax
Date: Fri Sep 27 06:03:11 2013
New Revision: 1526799

URL: http://svn.apache.org/r1526799
Log:
[OPENMEETINGS-806] addNewUser SOAP method returns valid error code if any

Modified:
    
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
    
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java

Modified: 
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java?rev=1526799&r1=1526798&r2=1526799&view=diff
==============================================================================
--- 
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
 (original)
+++ 
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
 Fri Sep 27 06:03:11 2013
@@ -757,7 +757,7 @@ public class UserManager {
                                                sendSMS, baseURL,
                                                sendConfirmation, 
jNameTimeZone, false, "", "", false, true);
 
-                               if (sendConfirmation) {
+                               if (user_id > 0 && sendConfirmation) {
                                        return new Long(-40);
                                }
 

Modified: 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1526799&r1=1526798&r2=1526799&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 Fri Sep 27 06:03:11 2013
@@ -623,7 +623,7 @@ public class UserManager {
                                                sendSMS, baseURL,
                                                sendConfirmation, 
jNameTimeZone, false, "", "", false, true);
 
-                               if (sendConfirmation) {
+                               if (user_id > 0 && sendConfirmation) {
                                        return new Long(-40);
                                }
 
@@ -733,11 +733,9 @@ public class UserManager {
                // their Group
                if (authLevelUtil.checkModLevel(user_level)) {
 
-                       Integer userLoginMinimumLength = 
configurationDao.getConfValue(
-                                       LOGIN_MIN_LENGTH_KEY, Integer.class, 
"4");
+                       Integer userLoginMinimumLength = 
configurationDao.getConfValue(LOGIN_MIN_LENGTH_KEY, Integer.class, "4");
                        if (userLoginMinimumLength == null) {
-                               throw new Exception(
-                                               "user.login.minimum.length 
problem");
+                               throw new Exception("user.login.minimum.length 
problem");
                        }
 
                        // Check for required data