diff options
| author | Simon Rettberg | 2016-09-09 17:15:53 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-09 17:15:53 +0200 |
| commit | 5757b77d9fda6e9e25e6732a8c879b8e8dbf0bdb (patch) | |
| tree | 5c815ffdccc8433a919cedde4452b536986c63b1 | |
| parent | [client] Dozmod-Client Disclaimer (Hauftungsausschluss) aktualistert (+2015 -... (diff) | |
| download | tutor-module-5757b77d9fda6e9e25e6732a8c879b8e8dbf0bdb.tar.gz tutor-module-5757b77d9fda6e9e25e6732a8c879b8e8dbf0bdb.tar.xz tutor-module-5757b77d9fda6e9e25e6732a8c879b8e8dbf0bdb.zip | |
[client] UserCache: Fix fallback to querying master server
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java index c831cd54..d3774d58 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java @@ -81,15 +81,15 @@ public class UserCache { return cachedUserFromMaster.get(userId); // Try again with a potential refresh List<UserInfo> newList = cache.get(CacheMode.DEFAULT); - if (list == newList) // Returned list from cache as it was still recent enough - return null; - user = find(userId, newList); + if (list != newList) { // Skip second searh if lists are identical + user = find(userId, newList); + } if (user == null) { // not in cached map either, query master try { user = ThriftManager.getMasterClient().getUser(Session.getMasterToken(), userId); } catch (TException e) { - LOGGER.error("User with ID '" + userId + "' not found on the masterserver."); + LOGGER.error("User with ID '" + userId + "' not found on the masterserver.", e); return null; } // remember it |