Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1233: return empty array instead of null for certain get*s methods in Document 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@637053 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2008-03-14 11:08:28 +00:00
parent 966ae0382e
commit b309970c3d
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -54,6 +54,10 @@ API Changes
deletes from the index. This should be a somewhat lower cost
operation than optimize. (John Wang via Mike McCandless)
6. LUCENE-1233: Return empty array instead of null when no fields
match the specified name in these methods in Document:
getFieldables, getFields, getValues, getBinaryValues. (Stefan
Trcek vai Mike McCandless)
Bug fixes

28
src/java/org/apache/lucene/document/Document.java
View File

@ -17,10 +17,6 @@ package org.apache.lucene.document;
* limitations under the License.
*/
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.Searcher;
import java.util.*; // for javadoc
/** Documents are the unit of indexing and search.
@ -196,9 +192,10 @@ public final class Document implements java.io.Serializable {
return fields;
}
private final static Field[] NO_FIELDS = new Field[0];
/**
* Returns an array of {@link Field}s with the given name.
* This method can return <code>null</code>.
* Do not use with lazy loaded fields.
*
* @param name the name of the field
@ -214,15 +211,16 @@ public final class Document implements java.io.Serializable {
}
if (result.size() == 0)
return null;
return NO_FIELDS;
return (Field[])result.toArray(new Field[result.size()]);
}
/**
private final static Fieldable[] NO_FIELDABLES = new Fieldable[0];
/**
* Returns an array of {@link Fieldable}s with the given name.
* This method can return <code>null</code>.
*
* @param name the name of the field
* @return a <code>Fieldable[]</code> array or <code>null</code>
@ -237,15 +235,16 @@ public final class Document implements java.io.Serializable {
}
if (result.size() == 0)
return null;
return NO_FIELDABLES;
return (Fieldable[])result.toArray(new Fieldable[result.size()]);
}
private final static String[] NO_STRINGS = new String[0];
/**
* Returns an array of values of the field specified as the method parameter.
* This method can return <code>null</code>.
*
* @param name the name of the field
* @return a <code>String[]</code> of field values or <code>null</code>
@ -259,15 +258,16 @@ public final class Document implements java.io.Serializable {
}
if (result.size() == 0)
return null;
return NO_STRINGS;
return (String[])result.toArray(new String[result.size()]);
}
private final static byte[][] NO_BYTES = new byte[0][];
/**
* Returns an array of byte arrays for of the fields that have the name specified
* as the method parameter. This method will return <code>null</code> if no
* binary fields with the specified name are available.
* as the method parameter.
*
* @param name the name of the field
* @return a <code>byte[][]</code> of binary field values or <code>null</code>
@ -281,7 +281,7 @@ public final class Document implements java.io.Serializable {
}
if (result.size() == 0)
return null;
return NO_BYTES;
return (byte[][])result.toArray(new byte[result.size()][]);
}