From 15740b48ca4eedd533f8c67d2a7287761fe6bde9 Mon Sep 17 00:00:00 2001
From: Eduardo Ramirez <eduardor@netflix.com>
Date: Fri, 20 Dec 2024 11:06:40 -0800
Subject: [PATCH] DO NOT MERGE: what we need to have on the consumer side

---
 .../core/read/engine/map/HollowMapDeltaApplicator.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java
index 1994926a91..cfd33d1452 100644
--- a/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java
+++ b/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java
@@ -143,7 +143,12 @@ private void mergeOrdinal(int ordinal) {
             if(!removeData) {
                 for(long bucketIdx=currentFromStateStartBucket; bucketIdx<fromDataEndBucket; bucketIdx++) {
                     long bucketKey = from.entryData.getElementValue(bucketIdx * from.bitsPerMapEntry, from.bitsPerKeyElement);
-                    long bucketValue = from.entryData.getElementValue(bucketIdx * from.bitsPerMapEntry + from.bitsPerKeyElement, from.bitsPerValueElement);
+                    long bucketValue;
+                    if (from.bitsPerValueElement == 0) {
+                        bucketValue = 0;
+                    } else {
+                        bucketValue = from.entryData.getElementValue(bucketIdx * from.bitsPerMapEntry + from.bitsPerKeyElement, from.bitsPerValueElement);
+                    }
                     if(bucketKey == from.emptyBucketKeyValue)
                         bucketKey = target.emptyBucketKeyValue;
                     long currentWriteStartBucketBit = currentWriteStartBucket * target.bitsPerMapEntry;