Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11066: Use timeZone.toZoneId instead of ZoneId.of(timeZoneString) because the latter cannot lookup short aliases

This commit is contained in:
Shalin Shekhar Mangar 2018-03-07 17:22:36 +05:30
parent 1b8651db4f
commit 498927d032
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
View File

@ -20,7 +20,6 @@ package org.apache.solr.cloud.autoscaling;
import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoField;
@ -101,12 +100,13 @@ public class ScheduledTrigger extends TriggerBase {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"Either 'startTime' should be an ISO-8601 date time string or 'timeZone' must be not be null");
}
TimeZone timeZone = TimeZone.getTimeZone(timeZoneStr);
DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder()
.append(DateTimeFormatter.ISO_LOCAL_DATE).appendPattern("['T'[HH[:mm[:ss]]]]")
.parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
.parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
.parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
.toFormatter(Locale.ROOT).withZone(ZoneId.of(timeZoneStr));
.toFormatter(Locale.ROOT).withZone(timeZone.toZoneId());
return Instant.from(dateTimeFormatter.parse(startTimeStr));
}

1
solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
View File

@ -57,7 +57,6 @@ public class ScheduledTriggerTest extends SolrCloudTestCase {
}
@Test
@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testTrigger() throws Exception {
CoreContainer container = cluster.getJettySolrRunners().get(0).getCoreContainer();