svn commit: r1702852 - in /openmeetings: branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java

[solomax]

Author: solomax
Date: Mon Sep 14 04:36:27 2015
New Revision: 1702852

URL: http://svn.apache.org/r1702852
Log:
[OPENMEETINGS-954] better login error handling

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1702852&r1=1702851&r2=1702852&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
 Mon Sep 14 04:36:27 2015
@@ -52,6 +52,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.util.crypt.ManageCryptStyle;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
@@ -179,6 +180,8 @@ public class MobileService {
                try {
                        User u = userDao.login(login, password);
                        result = login(u, result);
+               } catch (OmException e) {
+                       result.put("status", e.getCode());
                } catch (Exception e) {
                        log.error("[loginUser]", e);
                }

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1702852&r1=1702851&r2=1702852&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
 Mon Sep 14 04:36:27 2015
@@ -51,6 +51,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.user.State;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.util.crypt.ManageCryptStyle;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
@@ -176,6 +177,8 @@ public class MobileService {
                try {
                        User u = userDao.login(login, password);
                        result = login(u, result);
+               } catch (OmException e) {
+                       result.put("status", e.getCode());
                } catch (Exception e) {
                        log.error("[loginUser]", e);
                }