You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/01/27 00:57:22 UTC
svn commit: r1063925 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/CHANGES.txt
solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java
Author: yonik
Date: Wed Jan 26 23:57:21 2011
New Revision: 1063925
URL: http://svn.apache.org/viewvc?rev=1063925&view=rev
Log:
SOLR-1283: fix numRead counter that caused mark invalid exceptions
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1063925&r1=1063924&r2=1063925&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Wed Jan 26 23:57:21 2011
@@ -484,6 +484,10 @@ Bug Fixes
* SOLR-482: Provide more exception handling in CSVLoader (gsingers)
+* SOLR-1283: HTMLStripCharFilter sometimes threw a "Mark Invalid" exception.
+ (Julien Coloos, hossman, yonik)
+
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java?rev=1063925&r1=1063924&r2=1063925&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java Wed Jan 26 23:57:21 2011
@@ -103,6 +103,7 @@ public class HTMLStripCharFilter extends
if (len>0) {
return pushed.charAt(len-1);
}
+ numRead++;
int ch = input.read();
push(ch);
return ch;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java?rev=1063925&r1=1063924&r2=1063925&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/HTMLStripCharFilterTest.java Wed Jan 26 23:57:21 2011
@@ -170,7 +170,7 @@ public class HTMLStripCharFilterTest ext
public void testBufferOverflow() throws Exception {
StringBuilder testBuilder = new StringBuilder(HTMLStripCharFilter.DEFAULT_READ_AHEAD + 50);
- testBuilder.append("ah<?> ");
+ testBuilder.append("ah<?> ??????");
appendChars(testBuilder, HTMLStripCharFilter.DEFAULT_READ_AHEAD + 500);
processBuffer(testBuilder.toString(), "Failed on pseudo proc. instr.");//processing instructions