You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/09/19 00:21:52 UTC
lucene-solr:master: SOLR-12759: fix regexp
Repository: lucene-solr
Updated Branches:
refs/heads/master 5abee478b -> c06a7ab0c
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/c06a7ab0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c06a7ab0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c06a7ab0
Branch: refs/heads/master
Commit: c06a7ab0c79306c221f6441641bde973b2ff1e56
Parents: 5abee47
Author: David Smiley <ds...@apache.org>
Authored: Tue Sep 18 20:21:44 2018 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue Sep 18 20:21:44 2018 -0400
----------------------------------------------------------------------
.../solr/handler/extraction/ExtractingRequestHandlerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c06a7ab0/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 85e1c78..4401745 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,7 +45,7 @@ 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}([+-]\\d\\d(:\\d\\d)?)?")) {
+ 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?";
assumeTrue("SOLR-12759 JDK 11 (1st release) and Tika 1.x can result in extracting dates in a bad format.", false);
}