mirrors/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-25 16:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #725 from stianst/master

Browse Source 
Fixes to infinispan user session provider
This commit is contained in:
Stian Thorgersen
2014-10-02 09:43:21 +02:00
parent 6ff37cfc24 597ee2b8c9
commit 01e6d09d79
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java
View File

@@ -395,7 +395,7 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
throw new IllegalStateException("Can't remove session: task in progress for session");
}
} else {
tasks.put(key, new CacheTask(cache, CacheOperation.ADD, key, value));
tasks.put(key, new CacheTask(cache, CacheOperation.REPLACE, key, value));
}
}
@@ -426,6 +426,7 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
break;
case REPLACE:
cache.replace(key, value);
break;
}
}
}

4
model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/mapreduce/ClientSessionMapper.java
View File

@@ -80,7 +80,9 @@ public class ClientSessionMapper implements Mapper<String, SessionEntity, String
collector.emit(key, entity);
break;
case USER_SESSION_AND_TIMESTAMP:
collector.emit(entity.getUserSession(), entity.getTimestamp());
if (entity.getUserSession() != null) {
collector.emit(entity.getUserSession(), entity.getTimestamp());
}
break;
}
}