diff options
author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-08-22 16:03:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-22 16:03:58 +0000 |
commit | 507028e964c7cbc448cc7273daf5017a3d2fad9f (patch) | |
tree | 233d03f949544f342809e2df3fa0e75cef54c4ab | |
parent | 6aa8df125c359d265ce66772a4fa93cdc59edab9 (diff) | |
parent | 5d3234a83db151db7f7f3b95ba9c48ae896f35b1 (diff) | |
download | cloud-507028e964c7cbc448cc7273daf5017a3d2fad9f.tar.gz |
Merge "Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user." into idea133
-rw-r--r-- | login/src/com/google/gct/login/GoogleLogin.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/login/src/com/google/gct/login/GoogleLogin.java b/login/src/com/google/gct/login/GoogleLogin.java index 50d6c67..2537799 100644 --- a/login/src/com/google/gct/login/GoogleLogin.java +++ b/login/src/com/google/gct/login/GoogleLogin.java @@ -695,7 +695,13 @@ public class GoogleLogin { if(activeUserString == null) { users.removeActiveUser(); } else { - users.setActiveUser(activeUserString); + try { + users.setActiveUser(activeUserString); + } catch (IllegalArgumentException ex) { + GOOGLE_LOGIN_LOG.error("Error while initiating users", ex); + // Set no active user + users.removeActiveUser(); + } } } } |