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 2016/07/16 08:10:01 UTC
lucene-solr:master: LUCENE-7382: Fix bug introduced by LUCENE-7355
that used the wrong default AttributeFactory for new Tokenizers
Repository: lucene-solr
Updated Branches:
refs/heads/master 833c8ee15 -> 2585c9f3f
LUCENE-7382: Fix bug introduced by LUCENE-7355 that used the wrong default AttributeFactory for new Tokenizers
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2585c9f3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2585c9f3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2585c9f3
Branch: refs/heads/master
Commit: 2585c9f3ff750b8e551f261412625aef0e7d4a4b
Parents: 833c8ee
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Jul 16 10:09:40 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Jul 16 10:09:40 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 ++++
lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2585c9f3/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 92ee7b9..6c62aab 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -65,6 +65,10 @@ Bug Fixes
* LUCENE-7340: MemoryIndex.toString() could throw NPE; fixed. Renamed to toStringDebug().
(Daniel Collins, David Smiley)
+* LUCENE-7382: Fix bug introduced by LUCENE-7355 that used the
+ wrong default AttributeFactory for new Tokenizers.
+ (Terry Smith, Uwe Schindler)
+
Improvements
* LUCENE-7323: Compound file writing now verifies the incoming
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2585c9f3/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java b/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
index 0d60d24..aa4b42d 100644
--- a/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
+++ b/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
@@ -287,9 +287,9 @@ public abstract class Analyzer implements Closeable {
/** Return the {@link AttributeFactory} to be used for
* {@link #tokenStream analysis} and
* {@link #normalize(String, String) normalization}. The default
- * implementation returns {@link AttributeFactory#DEFAULT_ATTRIBUTE_FACTORY}. */
+ * implementation returns {@link TokenStream#DEFAULT_TOKEN_ATTRIBUTE_FACTORY}. */
protected AttributeFactory attributeFactory() {
- return AttributeFactory.DEFAULT_ATTRIBUTE_FACTORY;
+ return TokenStream.DEFAULT_TOKEN_ATTRIBUTE_FACTORY;
}
/**