1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/google/gct/login/CredentialedUserRoster.java b/src/com/google/gct/login/CredentialedUserRoster.java
index 21aa574..f96ea6b 100644
--- a/src/com/google/gct/login/CredentialedUserRoster.java
+++ b/src/com/google/gct/login/CredentialedUserRoster.java
@@ -63,7 +63,9 @@ public class CredentialedUserRoster {
    */
   @Nullable
   public CredentialedUser getActiveUser() {
-    return myActiveUser;
+    synchronized (this) {
+      return myActiveUser;
+    }
   }
 
   /**
@@ -119,7 +121,9 @@ public class CredentialedUserRoster {
    * @return True if there is an active user and false otherwise.
    */
   public boolean isActiveUserAvailable() {
-    return myActiveUser != null;
+    synchronized (this) {
+      return myActiveUser != null;
+    }
   }
 
   /**
@@ -193,5 +197,4 @@ public class CredentialedUserRoster {
       }
     }
   }
-
 }