Fix for incorrect timezone selection (#1046)

* Fix for incorrect timezone selection
maxcom · Nov 4, 2023 · 368f462 · 368f462
1 parent f2b1a62
commit 368f462
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/main/java/ru/org/linux/search/SearchRequest.java b/src/main/java/ru/org/linux/search/SearchRequest.java
@@ -165,11 +165,8 @@ public boolean isDateSelected() {
   }
 
   public long atEndOfDaySelected(DateTimeZone tz) {
-    Calendar calendar = Calendar.getInstance();
+    final Calendar calendar = tz!=null? Calendar.getInstance(tz.toTimeZone()) : Calendar.getInstance();
     calendar.setTime(new Date(dt));
-    if (tz!=null) {
-      calendar.setTimeZone(tz.toTimeZone());
-    }
     calendar.set(Calendar.HOUR_OF_DAY, 23);
     calendar.set(Calendar.MINUTE, 59);
     calendar.set(Calendar.SECOND, 59);
@@ -178,11 +175,8 @@ public long atEndOfDaySelected(DateTimeZone tz) {
   }
 
   public long atStartOfDaySelected(DateTimeZone tz) {
-    Calendar calendar = Calendar.getInstance();
+    final Calendar calendar = tz!=null? Calendar.getInstance(tz.toTimeZone()) : Calendar.getInstance();
     calendar.setTime(new Date(dt));
-    if (tz!=null) {
-      calendar.setTimeZone(tz.toTimeZone());
-    }
     calendar.set(Calendar.HOUR_OF_DAY, 0);
     calendar.set(Calendar.MINUTE, 0);
     calendar.set(Calendar.SECOND, 0);