diff --git a/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java b/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
index 02304c0..32ebfdb 100644
--- a/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
+++ b/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
@@ -173,7 +173,7 @@ public class KeycloakInstalled {
}
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()) {
refreshToken();
}
diff --git a/social/core/src/main/java/org/keycloak/social/SocialUser.java b/social/core/src/main/java/org/keycloak/social/SocialUser.java
index 9a1faed..ca9f987 100644
--- a/social/core/src/main/java/org/keycloak/social/SocialUser.java
+++ b/social/core/src/main/java/org/keycloak/social/SocialUser.java
@@ -34,12 +34,14 @@ public class SocialUser {
}
public void setName(String name) {
- int i = name.lastIndexOf(' ');
- if (i != -1) {
- firstName = name.substring(0, i);
- lastName = name.substring(i + 1);
- } else {
- firstName = name;
+ if (name != null) {
+ int i = name.lastIndexOf(' ');
+ if (i != -1) {
+ firstName = name.substring(0, i);
+ lastName = name.substring(i + 1);
+ } else {
+ firstName = name;
+ }
}
}