commit e7ed5d50616fad0600ffeed89879aea71bbee2fa
author Patrick Flynn <paflynn@google.com> Wed Apr 22 16:56:56 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 22 16:56:56 2015 +0000
tree 68fe619b2f550bb0206a3beba42a12b33b5ba027
parent 8fea585bb0d1f9b3be3d02aefd800d053418352c
parent adb9af592a6f210b68f9830f73dc9e5e3a58b852

Small change to synchronize all read operations on the credentialeduserroster.
automerge: adb9af5

* commit 'adb9af592a6f210b68f9830f73dc9e5e3a58b852':
  Small change to synchronize all read operations on the credentialeduserroster.

src/com/google/gct/login/CredentialedUserRoster.java

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 @@
    */
   @Nullable
   public CredentialedUser getActiveUser() {
-    return myActiveUser;
+    synchronized (this) {
+      return myActiveUser;
+    }
   }
 
   /**
@@ -119,7 +121,9 @@
    * @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 @@
       }
     }
   }
-
 }