Merge branch 'master' into command_framework

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 0f0de2dec..f0dd363db 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -19,9 +19,6 @@ import org.traccar.Context;
 import org.traccar.api.resource.SessionResource;
 import org.traccar.model.User;
 
-import java.lang.reflect.Method;
-import java.nio.charset.Charset;
-import java.sql.SQLException;
 import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.WebApplicationException;
@@ -31,6 +28,9 @@ import javax.ws.rs.container.ResourceInfo;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.xml.bind.DatatypeConverter;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLException;
 
 public class SecurityRequestFilter implements ContainerRequestFilter {
 
@@ -42,7 +42,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
         auth = auth.replaceFirst("[B|b]asic ", "");
         byte[] decodedBytes = DatatypeConverter.parseBase64Binary(auth);
         if (decodedBytes != null && decodedBytes.length > 0) {
-            return new String(decodedBytes, Charset.defaultCharset()).split(":", 2);
+            return new String(decodedBytes, StandardCharsets.US_ASCII).split(":", 2);
         }
         return null;
     }