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/09/26 11:50:07 UTC
[36/45] lucene-solr:jira/solr-12709: SOLR-12759: fix regexp
SOLR-12759: fix regexp
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9bc4b8d4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9bc4b8d4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9bc4b8d4
Branch: refs/heads/jira/solr-12709
Commit: 9bc4b8d4fe3bb220ca3a27fb252b703b39443a3c
Parents: 3f2975c
Author: David Smiley <ds...@apache.org>
Authored: Mon Sep 24 15:21:59 2018 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Mon Sep 24 15:21:59 2018 -0400
----------------------------------------------------------------------
.../solr/handler/extraction/ExtractingRequestHandlerTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bc4b8d4/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 4401745..132b371 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -45,8 +45,10 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
// Is the JDK/env affected by a known bug?
- if (!TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT, Locale.US).matches("[A-Z]{3,4}([+-]\\d\\d(:\\d\\d)?)?")) {
- assert System.getProperty("java.version").startsWith("11") : "Is some other JVM affected? Or bad regex?";
+ final String tzDisplayName = TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT, Locale.US);
+ if (!tzDisplayName.matches("[A-Z]{3,}([+-]\\d\\d(:\\d\\d)?)?")) {
+ assertTrue("Is some other JVM affected? Or bad regex? TzDisplayName: " + tzDisplayName,
+ System.getProperty("java.version").startsWith("11"));
assumeTrue("SOLR-12759 JDK 11 (1st release) and Tika 1.x can result in extracting dates in a bad format.", false);
}