keycloak-aplcache

Merge pull request #1621 from stianst/master KEYCLOAK-1854

9/17/2015 3:36:08 AM

Stian Thorgersen

Commit: dc327dd

Tree: a9b0ff7

Parents: e646740
2eaa035

Changes

services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java 4(+3 -1)

Details

services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java 4(+3 -1)

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java b/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java
index bc0329a..e34edc9 100644
--- a/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java
@@ -46,7 +46,9 @@ public class SystemInfoRepresentation {
         rep.userName = System.getProperty("user.name");
         rep.userDir = System.getProperty("user.dir");
         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;
     }