docs/attachments/LUCENE-3521/LUCENE-3521.patch

Index: solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: solr/contrib/extraction/lib/icu4j-4_8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: solr/contrib/analysis-extras/lib/icu4j-4_8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: modules/analysis/icu/lib/icu4j-4_8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: modules/analysis/icu/lib/icu4j-4_8_1_1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: modules/analysis/icu/lib/icu4j-4_8_1_1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
===================================================================
--- lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java	(revision 1183464)
+++ lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java	(working copy)
@@ -324,9 +324,6 @@
     random.setSeed(staticSeed);
     random.initialized = true;
   }
-  
-  @Deprecated
-  private static boolean icuTested = false;
 
   @BeforeClass
   public static void beforeClassLuceneTestCaseJ4() {
@@ -379,20 +376,6 @@
     
     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();