Author: nzamosenchuk Date: 2011-11-10 04:13:24 -0500 (Thu, 10 Nov 2011) New Revision: 5177 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingletonTokenStream.java Log: EXOJCR-1538: Avoid setting Value to null in SingleTokenStream, because this causes serialization in clustered environment with empty value, thus making indexing unreliable. Adding custom readExternal/writeExternal skipping the serialization of the hasNext field. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingletonTokenStream.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingletonTokenStream.java 2011-11-10 07:10:17 UTC (rev 5176) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingletonTokenStream.java 2011-11-10 09:13:24 UTC (rev 5177) @@ -19,16 +19,19 @@ import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.index.Payload; +import org.exoplatform.services.jcr.impl.Constants; +import java.io.Externalizable; import java.io.IOException; -import java.io.Serializable; +import java.io.ObjectInput; +import java.io.ObjectOutput; /** * <code>SingletonTokenStream</code> implements a token stream that wraps a * single value with a given property type. The property type is stored as a * payload on the single returned token. */ -public final class SingletonTokenStream extends TokenStream implements Serializable +public final class SingletonTokenStream extends TokenStream implements Externalizable { /** @@ -41,12 +44,13 @@ */ private Payload payload; + private boolean hasNext = true; + /** * for serialization */ public SingletonTokenStream() { - // TODO Auto-generated constructor stub } /** @@ -78,16 +82,40 @@ */ public Token next(Token reusableToken) throws IOException { - if (value == null) + if (hasNext) { - return null; + reusableToken.clear(); + reusableToken.setTermBuffer(value); + reusableToken.setPayload(payload); + reusableToken.setStartOffset(0); + reusableToken.setEndOffset(value.length()); + hasNext = false; + return reusableToken; } - reusableToken.clear(); - reusableToken.setTermBuffer(value); - reusableToken.setPayload(payload); - reusableToken.setStartOffset(0); - reusableToken.setEndOffset(value.length()); - value = null; - return reusableToken; + return null; } + + /** + * {@inheritDoc} + */ + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException + { + payload = (Payload)in.readObject(); + int length = in.readInt(); + byte[] binValue = new byte[length]; + in.read(binValue); + value = new String(binValue, Constants.DEFAULT_ENCODING); + } + + /** + * {@inheritDoc} + */ + public void writeExternal(ObjectOutput out) throws IOException + { + // skip writing hasNext field + out.writeObject(payload); + byte[] binValue = value.getBytes(Constants.DEFAULT_ENCODING); + out.writeInt(binValue.length); + out.write(binValue); + } }