Author: hossman
Date: Sun May 30 04:28:11 2010
New Revision: 949471
URL: http://svn.apache.org/viewvc?rev=949471&view=rev
Log:
merging r891596 from solr/branches/branch-1.5-dev for SOLR-1660
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 30 04:28:11 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,883566
+/lucene/solr/trunk:881642,881906,883566,891596
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949471&r1=949470&r2=949471&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Sun May 30 04:28:11 2010
@@ -59,6 +59,9 @@ Bug Fixes
set when streaming updates, rather than using UTF-8 as the HTTP headers
indicated, leading to an encoding mismatch. (hossman, yonik)
+* SOLR-1660: CapitalizationFilter crashes if you use the maxWordCountOption
+ (Robert Muir via shalin)
+
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Modified:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java?rev=949471&r1=949470&r2=949471&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
(original)
+++
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
Sun May 30 04:28:11 2010
@@ -206,6 +206,7 @@ class CapitalizationFilter extends Token
char[] backup = null;
if (factory.maxWordCount <
CapitalizationFilterFactory.DEFAULT_MAX_WORD_COUNT) {
//make a backup in case we exceed the word count
+ backup = new char[termBufferLength];
System.arraycopy(termBuffer, 0, backup, 0, termBufferLength);
}
if (termBufferLength < factory.maxTokenLength) {
