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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2014-06-02 09:37:30 -04:00
commit a180c6b896
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
View file

@ -173,7 +173,7 @@ public class KeycloakInstalled {
} }
public String getTokenString(long minValidity, TimeUnit unit) throws VerificationException, IOException, ServerRequest.HttpFailure { public String getTokenString(long minValidity, TimeUnit unit) throws VerificationException, IOException, ServerRequest.HttpFailure {
long expires = token.getExpiration() * 1000 - unit.toMillis(minValidity); long expires = ((long) token.getExpiration()) * 1000 - unit.toMillis(minValidity);
if (expires < System.currentTimeMillis()) { if (expires < System.currentTimeMillis()) {
refreshToken(); refreshToken();
} }

14
social/core/src/main/java/org/keycloak/social/SocialUser.java
View file

@ -34,12 +34,14 @@ public class SocialUser {
} }
public void setName(String name) { public void setName(String name) {
int i = name.lastIndexOf(' '); if (name != null) {
if (i != -1) { int i = name.lastIndexOf(' ');
firstName = name.substring(0, i); if (i != -1) {
lastName = name.substring(i + 1); firstName = name.substring(0, i);
} else { lastName = name.substring(i + 1);
firstName = name; } else {
firstName = name;
}
} }
} }