Change

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -172,7 +172,7 @@ BulkRequest internalAdd(IndexRequest request) {
 
         requests.add(request);
         // lack of source is validated in validate() method
-        sizeInBytes += (request.source() != null ? request.source().length() : 0) + REQUEST_OVERHEAD;
+        sizeInBytes += request.sourceSize() + REQUEST_OVERHEAD;
         indices.add(request.index());
         return this;
     }

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

@@ -429,11 +429,11 @@ public boolean isPipelineResolved() {
      * The source of the document to index, recopied to a new array if it is unsafe.
      */
     public BytesReference source() {
-        return modernSource.originalSourceBytes();
+        return modernSource == null ? null : modernSource.originalSourceBytes();
     }
 
     public int sourceSize() {
-        return modernSource.originalSourceSize();
+        return modernSource == null ? 0 : modernSource.originalSourceSize();
     }
 
     public void setStructuredSource(ESONIndexed.ESONObject esonSource) {