libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #1621 from stianst/master

Browse source 
KEYCLOAK-1854
This commit is contained in:
Stian Thorgersen 2015-09-17 08:36:08 +02:00
commit dc327ddddb
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java
View file

@ -46,7 +46,9 @@ public class SystemInfoRepresentation {
rep.userName = System.getProperty("user.name"); rep.userName = System.getProperty("user.name");
rep.userDir = System.getProperty("user.dir"); rep.userDir = System.getProperty("user.dir");
rep.userTimezone = System.getProperty("user.timezone"); rep.userTimezone = System.getProperty("user.timezone");
rep.userLocale = (new Locale(System.getProperty("user.country"), System.getProperty("user.language")).toString()); if (System.getProperty("user.country") != null && System.getProperty("user.language") != null) {
rep.userLocale = (new Locale(System.getProperty("user.country"), System.getProperty("user.language")).toString());
}
return rep; return rep;
} }