You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/03/07 12:33:32 UTC
[10/11] lucene-solr:jira/solr-11670-2: SOLR-11066: Use
timeZone.toZoneId instead of ZoneId.of(timeZoneString) because the latter
cannot lookup short aliases
SOLR-11066: Use timeZone.toZoneId instead of ZoneId.of(timeZoneString) because the latter cannot lookup short aliases
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/498927d0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/498927d0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/498927d0
Branch: refs/heads/jira/solr-11670-2
Commit: 498927d0324374cfb37d97ae303154c84a07dad7
Parents: 1b8651d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Mar 7 17:22:36 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Mar 7 17:22:36 2018 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java | 4 ++--
.../org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/498927d0/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
index 1aa7a0a..6aeac2c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
@@ -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));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/498927d0/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
index 6454224..6fedd95 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java
@@ -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();