You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/04/16 09:19:36 UTC
svn commit: r1326515 - in /lucene/dev/trunk/modules/analysis/common/src:
java/org/apache/lucene/analysis/charfilter/CharFilter.java
test/org/apache/lucene/analysis/core/TestRandomChains.java
Author: uschindler
Date: Mon Apr 16 07:19:35 2012
New Revision: 1326515
URL: http://svn.apache.org/viewvc?rev=1326515&view=rev
Log:
Reverted CharFilter changes. The rest of patch is fine.
Reverse merged revision(s) 1326512 from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java:
LUCENE-3990: Fix CharFilter to delegate correctly (and prevent CharFilter slowdown! - maybe backport!!!)
Modified:
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java?rev=1326515&r1=1326514&r2=1326515&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java Mon Apr 16 07:19:35 2012
@@ -66,11 +66,6 @@ public abstract class CharFilter extends
}
@Override
- public int read() throws IOException {
- return input.read();
- }
-
- @Override
public boolean markSupported(){
return input.markSupported();
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1326515&r1=1326514&r2=1326515&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Mon Apr 16 07:19:35 2012
@@ -766,19 +766,19 @@ public class TestRandomChains extends Ba
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
readSomething = true;
- return super.read(cbuf, off, len);
+ return input.read(cbuf, off, len);
}
@Override
public int read() throws IOException {
readSomething = true;
- return super.read();
+ return input.read();
}
@Override
public long skip(long n) throws IOException {
readSomething = true;
- return super.skip(n);
+ return input.skip(n);
}
}