Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38ECA72B5 for ; Tue, 26 Jul 2011 15:59:17 +0000 (UTC) Received: (qmail 30707 invoked by uid 500); 26 Jul 2011 15:59:16 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 30700 invoked by uid 99); 26 Jul 2011 15:59:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2011 15:59:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2011 15:59:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2B94C23888CB; Tue, 26 Jul 2011 15:58:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1151148 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java solr/ Date: Tue, 26 Jul 2011 15:58:54 -0000 To: commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110726155855.2B94C23888CB@eris.apache.org> Author: uschindler Date: Tue Jul 26 15:58:53 2011 New Revision: 1151148 URL: http://svn.apache.org/viewvc?rev=1151148&view=rev Log: LUCENE-3344: Add workaround for ICU bug during ULocale classloading with some Java7-only locales Modified: lucene/dev/branches/branch_3x/ (props changed) lucene/dev/branches/branch_3x/lucene/ (props changed) lucene/dev/branches/branch_3x/lucene/backwards/ (props changed) lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed) lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed) lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java lucene/dev/branches/branch_3x/solr/ (props changed) Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1151148&r1=1151147&r2=1151148&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original) +++ lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Tue Jul 26 15:58:53 2011 @@ -230,6 +230,9 @@ public abstract class LuceneTestCase ext random.setSeed(staticSeed); random.initialized = true; } + + @Deprecated + private static boolean icuTested = false; @BeforeClass public static void beforeClassLuceneTestCaseJ4() { @@ -248,7 +251,23 @@ public abstract class LuceneTestCase ext random.nextInt(); // consume RandomCodecProvider's seed. } // end compatibility random-consumption + savedLocale = Locale.getDefault(); + + // START hack to init ICU safely before we randomize locales. + // ICU fails during classloading when a special Java7-only locale is the default + // see: http://bugs.icu-project.org/trac/ticket/8734 + if (!icuTested) { + icuTested = true; + try { + Locale.setDefault(Locale.US); + Class.forName("com.ibm.icu.util.ULocale"); + } catch (ClassNotFoundException cnfe) { + // ignore if no ICU is in classpath + } + } + // END hack + locale = TEST_LOCALE.equals("random") ? randomLocale(random) : localeForName(TEST_LOCALE); Locale.setDefault(locale); savedTimeZone = TimeZone.getDefault();