libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #2477 from stianst/KEYCLOAK-2608

Browse source 
KEYCLOAK-2608
This commit is contained in:
Stian Thorgersen 2016-04-04 10:04:45 +02:00
commit 78b11bca84
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/org/keycloak/common/util/Time.java
View file

@ -30,6 +30,10 @@ public class Time {
return ((int) (System.currentTimeMillis() / 1000)) + offset;
}
public static long currentTimeMillis() {
return System.currentTimeMillis() + (offset * 1000);
}
public static Date toDate(int time) {
return new Date(((long) time ) * 1000);
}

2
server-spi/src/main/java/org/keycloak/events/EventBuilder.java
View file

@ -169,7 +169,7 @@ public class EventBuilder {
}
private void send() {
event.setTime(Time.toMillis(Time.currentTime()));
event.setTime(Time.currentTimeMillis());
if (store != null) {
if (realm.getEnabledEventTypes() != null && !realm.getEnabledEventTypes().isEmpty() ? realm.getEnabledEventTypes().contains(event.getType().name()) : event.getType().isSaveByDefault()) {