lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1096128 - in /lucene/java/branches/lucene_3_0: ./ contrib/ contrib/analyzers/ contrib/analyzers/common/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ contrib/analyzers/common/src/test/ contrib/analyzers/common/src/t...
Date Sat, 23 Apr 2011 09:57:04 GMT
Author: uschindler
Date: Sat Apr 23 09:57:03 2011
New Revision: 1096128

URL: http://svn.apache.org/viewvc?rev=1096128&view=rev
Log:
LUCENE-3042: When a filter or consumer added Attributes to a TokenStream chain after it was already (partly) consumed [or clearAttributes(), captureState(), cloneAttributes(),... was called by the Tokenizer], the Tokenizer calling clearAttributes() or capturing state after addition may not do this on the newly added Attribute

Modified:
    lucene/java/branches/lucene_3_0/   (props changed)
    lucene/java/branches/lucene_3_0/CHANGES.txt   (contents, props changed)
    lucene/java/branches/lucene_3_0/build.xml   (props changed)
    lucene/java/branches/lucene_3_0/contrib/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/CHANGES.txt   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/common/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/benchmark/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/highlighter/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/java/branches/lucene_3_0/contrib/lucli/build.xml   (props changed)
    lucene/java/branches/lucene_3_0/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java   (props changed)
    lucene/java/branches/lucene_3_0/src/   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LengthFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LetterTokenizer.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java
    lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestSpans.java   (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java   (contents, props changed)

Propchange: lucene/java/branches/lucene_3_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,5 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
-/lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1060779,1072567
+/lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782,1096078
+/lucene/dev/branches/lucene_solr_3_1/lucene:1096127
+/lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1060779,1072567,1096073,1096077
 /lucene/java/branches/lucene_2_4:748824
 /lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336

Modified: lucene/java/branches/lucene_3_0/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/CHANGES.txt?rev=1096128&r1=1096127&r2=1096128&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/CHANGES.txt (original)
+++ lucene/java/branches/lucene_3_0/CHANGES.txt Sat Apr 23 09:57:03 2011
@@ -11,6 +11,14 @@ Bug fixes
 * LUCENE-1846: DateTools now uses the US locale everywhere, so DateTools.round()
   is safe also in strange locales.  (Uwe Schindler)
 
+* LUCENE-3042: When a filter or consumer added Attributes to a TokenStream
+  chain after it was already (partly) consumed [or clearAttributes(),
+  captureState(), cloneAttributes(),... was called by the Tokenizer],
+  the Tokenizer calling clearAttributes() or capturing state after addition 
+  may not do this on the newly added Attribute. This bug affected only
+  very special use cases of the TokenStream-API, most users would not
+  have recognized it.  (Uwe Schindler, Robert Muir)
+
 ======================= Release 3.0.3 2010-12-03 =======================
 
 Changes in runtime behavior

Propchange: lucene/java/branches/lucene_3_0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957490,957920,984210,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/CHANGES.txt:1096127
 /lucene/dev/trunk/lucene/CHANGES.txt:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,994979,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/CHANGES.txt:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/build.xml:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/build.xml:1096127
 /lucene/dev/trunk/lucene/build.xml:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/build.xml:748824
 /lucene/java/branches/lucene_2_9/build.xml:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib:1096127
 /lucene/dev/trunk/lucene/contrib:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/contrib:748824
 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt:1096127
 /lucene/dev/trunk/lucene/contrib/CHANGES.txt:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers:929738,930932,935522,939611,940730,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/contrib/analyzers:1028833,1028850,1029331,1029348
 /lucene/java/trunk/contrib/analyzers:887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers/common:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers/common:930932,957707,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/contrib/analyzers/common:1028833,1028850,1029331,1029348
 /lucene/java/trunk/contrib/analyzers/common:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1034017,1039773,1072567
 /lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:900030

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:957920,990167,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers/common/src/test:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/test:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test:1028833,1028850,1029331,1029348
 /lucene/java/trunk/contrib/analyzers/common/src/test:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1034017,1039773,1072567
 /lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:900030

Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/analyzers/smartcn:1096127
 /lucene/dev/trunk/lucene/contrib/analyzers/smartcn:930932,957707,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn:1028833,1028850,1029331,1029348
 /lucene/java/trunk/contrib/analyzers/smartcn:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/contrib/benchmark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/benchmark:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/benchmark:1096127
 /lucene/dev/trunk/lucene/contrib/benchmark:1034017,1039773,1072567
 /lucene/java/trunk/contrib/benchmark:900030

Propchange: lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:1096127
 /lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842,1072567
 /lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight:989035
 /lucene/java/branches/lucene_2_4/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:748824

Propchange: lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:1096127
 /lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842,1072567
 /lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight:989035
 /lucene/java/branches/lucene_2_4/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:748824

Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/highlighter:1096127
 /lucene/dev/trunk/lucene/contrib/highlighter:930932,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/contrib/highlighter:1028833,1028850,1029331,1029348
 /lucene/java/trunk/contrib/highlighter:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/highlighter/src/test:1096127
 /lucene/dev/trunk/lucene/contrib/highlighter/src/test:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
 /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:1096127
 /lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:748824
 /lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/contrib/lucli/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -0,0 +1 @@
+/lucene/dev/branches/branch_3x/lucene/contrib/lucli/build.xml:1096078

Propchange: lucene/java/branches/lucene_3_0/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:1096127
 /lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:929738,930932,932398,935014,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:748824
 /lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src:1096127
 /lucene/dev/trunk/lucene/src:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src:748824
 /lucene/java/branches/lucene_2_9/src:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:929738,930932,931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,96365
 4,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java:990161
 /lucene/dev/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.java:932749

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LengthFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1034017,1039773,1072567
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/LengthFilter.java:900030

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LetterTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1034017,1039773,1072567
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/LetterTokenizer.java:900030

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1034017,1039773,1072567
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:900030

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/Tokenizer.java:748824
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/standard:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard:1034017,1039773,1072567
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/standard:900030

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,2 +1,3 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1039773,1072567

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,2 +1,3 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java:1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java:1039773,1072567

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,2 +1,3 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1039773,1072567

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java:1024408
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842,1072567
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:748824

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Modified: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java?rev=1096128&r1=1096127&r2=1096128&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java (original)
+++ lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java Sat Apr 23 09:57:03 2011
@@ -93,10 +93,33 @@ public class AttributeSource {
     }
   }
       
+  /**
+   * This class holds the state of an AttributeSource.
+   * @see #captureState
+   * @see #restoreState
+   */
+  public static final class State implements Cloneable {
+    AttributeImpl attribute;
+    State next;
+    
+    @Override
+    public Object clone() {
+      State clone = new State();
+      clone.attribute = (AttributeImpl) attribute.clone();
+      
+      if (next != null) {
+        clone.next = (State) next.clone();
+      }
+      
+      return clone;
+    }
+  }
+    
   // These two maps must always be in sync!!!
   // So they are private, final and read-only from the outside (read-only iterators)
   private final Map<Class<? extends Attribute>, AttributeImpl> attributes;
   private final Map<Class<? extends AttributeImpl>, AttributeImpl> attributeImpls;
+  private final State[] currentState;
 
   private AttributeFactory factory;
   
@@ -116,6 +139,7 @@ public class AttributeSource {
     }
     this.attributes = input.attributes;
     this.attributeImpls = input.attributeImpls;
+    this.currentState = input.currentState;
     this.factory = input.factory;
   }
   
@@ -125,6 +149,7 @@ public class AttributeSource {
   public AttributeSource(AttributeFactory factory) {
     this.attributes = new LinkedHashMap<Class<? extends Attribute>, AttributeImpl>();
     this.attributeImpls = new LinkedHashMap<Class<? extends AttributeImpl>, AttributeImpl>();
+    this.currentState = new State[1];
     this.factory = factory;
   }
   
@@ -147,11 +172,8 @@ public class AttributeSource {
    * if one instance implements more than one Attribute interface.
    */
   public Iterator<AttributeImpl> getAttributeImplsIterator() {
-    if (hasAttributes()) {
-      if (currentState == null) {
-        computeCurrentState();
-      }
-      final State initState = currentState;
+    final State initState = getCurrentState();
+    if (initState != null) {
       return new Iterator<AttributeImpl>() {
         private State state = initState;
       
@@ -220,7 +242,7 @@ public class AttributeSource {
       // Attribute is a superclass of this interface
       if (!attributes.containsKey(curInterface)) {
         // invalidate state to force recomputation in captureState()
-        this.currentState = null;
+        this.currentState[0] = null;
         attributes.put(curInterface, att);
         attributeImpls.put(clazz, att);
       }
@@ -278,41 +300,21 @@ public class AttributeSource {
     }
     return attClass.cast(attImpl);
   }
-  
-  /**
-   * This class holds the state of an AttributeSource.
-   * @see #captureState
-   * @see #restoreState
-   */
-  public static final class State implements Cloneable {
-    private AttributeImpl attribute;
-    private State next;
     
-    @Override
-    public Object clone() {
-      State clone = new State();
-      clone.attribute = (AttributeImpl) attribute.clone();
-      
-      if (next != null) {
-        clone.next = (State) next.clone();
-      }
-      
-      return clone;
+  private State getCurrentState() {
+    State s  = currentState[0];
+    if (s != null || !hasAttributes()) {
+      return s;
     }
-  }
-  
-  private State currentState = null;
-  
-  private void computeCurrentState() {
-    currentState = new State();
-    State c = currentState;
+    State c = s = currentState[0] = new State();
     final Iterator<AttributeImpl> it = attributeImpls.values().iterator();
     c.attribute = it.next();
     while (it.hasNext()) {
       c.next = new State();
       c = c.next;
       c.attribute = it.next();
-    }        
+    }
+    return s;
   }
   
   /**
@@ -320,13 +322,8 @@ public class AttributeSource {
    * {@link AttributeImpl#clear()} on each Attribute implementation.
    */
   public void clearAttributes() {
-    if (hasAttributes()) {
-      if (currentState == null) {
-        computeCurrentState();
-      }
-      for (State state = currentState; state != null; state = state.next) {
-        state.attribute.clear();
-      }
+    for (State state = getCurrentState(); state != null; state = state.next) {
+      state.attribute.clear();
     }
   }
   
@@ -335,14 +332,8 @@ public class AttributeSource {
    * {@link #restoreState} to restore the state of this or another AttributeSource.
    */
   public State captureState() {
-    if (!hasAttributes()) {
-      return null;
-    }
-      
-    if (currentState == null) {
-      computeCurrentState();
-    }
-    return (State) this.currentState.clone();
+    final State state = this.getCurrentState();
+    return (state == null) ? null : (State) state.clone();
   }
   
   /**
@@ -375,15 +366,9 @@ public class AttributeSource {
   @Override
   public int hashCode() {
     int code = 0;
-    if (hasAttributes()) {
-      if (currentState == null) {
-        computeCurrentState();
-      }
-      for (State state = currentState; state != null; state = state.next) {
-        code = code * 31 + state.attribute.hashCode();
-      }
+    for (State state = getCurrentState(); state != null; state = state.next) {
+      code = code * 31 + state.attribute.hashCode();
     }
-    
     return code;
   }
   
@@ -406,14 +391,8 @@ public class AttributeSource {
         }
   
         // it is only equal if all attribute impls are the same in the same order
-        if (this.currentState == null) {
-          this.computeCurrentState();
-        }
-        State thisState = this.currentState;
-        if (other.currentState == null) {
-          other.computeCurrentState();
-        }
-        State otherState = other.currentState;
+        State thisState = this.getCurrentState();
+        State otherState = other.getCurrentState();
         while (thisState != null && otherState != null) {
           if (otherState.attribute.getClass() != thisState.attribute.getClass() || !otherState.attribute.equals(thisState.attribute)) {
             return false;
@@ -433,11 +412,8 @@ public class AttributeSource {
   public String toString() {
     StringBuilder sb = new StringBuilder().append('(');
     if (hasAttributes()) {
-      if (currentState == null) {
-        computeCurrentState();
-      }
-      for (State state = currentState; state != null; state = state.next) {
-        if (state != currentState) sb.append(',');
+      for (State state = getCurrentState(); state != null; state = state.next) {
+        if (sb.length() > 1) sb.append(',');
         sb.append(state.attribute.toString());
       }
     }
@@ -454,10 +430,7 @@ public class AttributeSource {
     
     // first clone the impls
     if (hasAttributes()) {
-      if (currentState == null) {
-        computeCurrentState();
-      }
-      for (State state = currentState; state != null; state = state.next) {
+      for (State state = getCurrentState(); state != null; state = state.next) {
         clone.attributeImpls.put(state.attribute.getClass(), (AttributeImpl) state.attribute.clone());
       }
     }

Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/util/StringHelper.java:1096127
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/StringHelper.java:1034017,1039773,1072567
 /lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:900030

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,3 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis:1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/analysis:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis:1034017,1039773,1072567
 /lucene/java/trunk/src/test/org/apache/lucene/analysis:900030

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/document/TestDateTools.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/index:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index:929738,930932,935522,940730,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index:1028833,1028850,1029331,1029348
 /lucene/java/trunk/src/test/org/apache/lucene/index:887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:957920,990167,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:1028833,1028850,1029331,1029348
 /lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:957920,990167,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:1028833,1028850,1029331,1029348
 /lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:957920,990167,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestSpans.java:1028833,1028850,1029331,1029348
 /lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:900030,903368,916543,919869

Modified: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java?rev=1096128&r1=1096127&r2=1096128&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java (original)
+++ lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java Sat Apr 23 09:57:03 2011
@@ -163,4 +163,15 @@ public class TestAttributeSource extends
       fail("Should throw IllegalArgumentException");
     } catch (IllegalArgumentException iae) {}
   }
+  
+  public void testLUCENE_3042() throws Exception {
+    final AttributeSource src1 = new AttributeSource();
+    src1.addAttribute(TermAttribute.class).setTermBuffer("foo");
+    int hash1 = src1.hashCode(); // this triggers a cached state
+    final AttributeSource src2 = new AttributeSource(src1);
+    src2.addAttribute(TypeAttribute.class).setType("bar");
+    assertTrue("The hashCode is identical, so the captured state was preserved.", hash1 != src1.hashCode());
+    assertEquals(src2.hashCode(), src1.hashCode());
+  }
+  
 }

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 09:57:03 2011
@@ -1,4 +1,5 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:1096127
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1072567
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348



Mime
View raw message