From e9d3a62eb1868d3655504bfae795bdbb196b0001 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Thu, 18 May 2023 23:04:00 -0400
Subject: [PATCH] Revert "CBG-2973: Fix panic for assigning to nil map inside
 Mutable1xBody (#6252)"

This reverts commit 044bf5b93fcb87077f4eb479e56fde0dc6d1d4cc.
---
 db/revision_cache_interface.go |  3 ---
 rest/api_test.go               | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/db/revision_cache_interface.go b/db/revision_cache_interface.go
index 2f82796b72..c3fc20aca4 100644
--- a/db/revision_cache_interface.go
+++ b/db/revision_cache_interface.go
@@ -162,9 +162,6 @@ func (rev *DocumentRevision) Mutable1xBody(db *DatabaseCollectionWithUser, reque
 	if err != nil {
 		return nil, err
 	}
-	if b == nil {
-		return nil, base.RedactErrorf("null doc body for docID: %s revID: %s", base.UD(rev.DocID), base.UD(rev.RevID))
-	}
 
 	b[BodyId] = rev.DocID
 	b[BodyRev] = rev.RevID
diff --git a/rest/api_test.go b/rest/api_test.go
index 4feb418d0b..6458df6b27 100644
--- a/rest/api_test.go
+++ b/rest/api_test.go
@@ -2678,19 +2678,6 @@ func TestDocChannelSetPruning(t *testing.T) {
 	assert.Equal(t, uint64(12), syncData.ChannelSetHistory[0].End)
 }
 
-func TestNullDocHandlingForMutable1xBody(t *testing.T) {
-	rt := NewRestTester(t, nil)
-	defer rt.Close()
-	collection := rt.GetSingleTestDatabaseCollectionWithUser()
-
-	documentRev := db.DocumentRevision{DocID: "doc1", BodyBytes: []byte("null")}
-
-	body, err := documentRev.Mutable1xBody(collection, nil, nil, false)
-	require.Error(t, err)
-	require.Nil(t, body)
-	assert.Contains(t, err.Error(), "null doc body for doc")
-}
-
 func TestTombstoneCompactionAPI(t *testing.T) {
 	rt := NewRestTester(t, nil)
 	rt.GetDatabase().PurgeInterval = 0