diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java index 905f6b9..634ecb4 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java @@ -53,6 +53,8 @@ import org.noggit.CharArr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.solr.common.util.ByteArrayUtf8CharSequence.convertCharSeq; + /** * Defines a space-efficient serialization/deserialization format for transferring data. *
@@ -810,7 +812,7 @@ public class JavaBinCodec implements PushWriter { */ public EnumFieldValue readEnumFieldValue(DataInputInputStream dis) throws IOException { Integer intValue = (Integer) readVal(dis); - String stringValue = (String) readVal(dis); + String stringValue = (String) convertCharSeq (readVal(dis)); return new EnumFieldValue(intValue, stringValue); } diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java index e60d8c7..24c9c22 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java @@ -65,6 +65,19 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 { } } + public void testReadAsCharSeq() throws Exception { + List