Fixes

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -170,8 +170,8 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
         final int originalSourceSize;
         if (in.getTransportVersion().onOrAfter(TransportVersions.STRUCTURED_SOURCE)) {
             if (in.readBoolean()) {
-                structuredSource = new ESONFlat(in);
                 originalSourceSize = in.readVInt();
+                structuredSource = new ESONFlat(in);
             } else {
                 BytesReference source = in.readBytesReference();
                 structuredSource = null;
@@ -453,7 +453,8 @@ public ESONFlat structuredSource() {
     }
 
     public Map<String, Object> sourceAsMap() {
-        return ESONIndexed.fromFlat(modernSource.structuredSource());
+        // TODO: Improve and remove need to do the bytes.
+        return XContentHelper.convertToMap(modernSource.originalSourceBytes(), false, contentType).v2();
     }
 
     /**
@@ -805,8 +806,8 @@ private void writeBody(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.STRUCTURED_SOURCE)) {
             out.writeBoolean(modernSource.isStructured());
             if (modernSource.isStructured()) {
-                ESONFlat structuredSource = modernSource.structuredSource();
                 out.writeVInt(modernSource.originalSourceSize());
+                ESONFlat structuredSource = modernSource.structuredSource();
                 out.writeBytesReference(structuredSource.getSerializedKeyBytes());
                 out.writeBytesReference(structuredSource.values().data());
             } else {