Merge branch 'master' of https://github.com/drolx/track

test rebase
drolx · Nov 21, 2023 · b9724ed · b9724ed
2 parents 76fbb0c + fabd96b
commit b9724ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/org/traccar/web/OverrideFilter.java b/src/main/java/org/traccar/web/OverrideFilter.java
@@ -75,8 +75,9 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                         .replace("${description}", description)
                         .replace("${colorPrimary}", colorPrimary);
 
-                response.setContentLength(alteredContent.length());
-                response.getOutputStream().write(alteredContent.getBytes());
+                byte[] data = alteredContent.getBytes();
+                response.setContentLength(data.length);
+                response.getOutputStream().write(data);
 
             } else {
                 response.getOutputStream().write(bytes);

diff --git a/traccar-web b/traccar-web