Fix start and end pointers

jruby · Aug 4, 2018 · ab40019 · ab40019
1 parent 468b346
commit ab40019
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -761,16 +761,7 @@ private final IRubyObject internalDeleteOpenAddressing(final int hash, final Ent
                   entries[(index * NUMBER_OF_ENTRIES) + 1] = null;
                   size--;
 
-                  // move pointers in case we deleted first or last element
-                  if (index == start && size > 0) {
-                      start++;
-                      while(entries[start * NUMBER_OF_ENTRIES] == null)
-                        start++;
-                  } else if (index == (end - 1) && (end - 1) > 0) {
-                      end--;
-                      while(entries[(end - 1) * NUMBER_OF_ENTRIES] == null && (end - 1) > 0)
-                        end--;
-                  }
+                  updateStartAndEndPointer(index);
                   return otherValue;
                 }
             }
@@ -796,16 +787,7 @@ private final IRubyObject internalDeleteLinearSearch(final int hash, final Entry
               entries[(index * NUMBER_OF_ENTRIES) + 1] = null;
               size--;
 
-              // move pointers in case we deleted first or last element
-              if (index == start && size > 0) {
-                  start++;
-                  while(entries[start * NUMBER_OF_ENTRIES] == null)
-                    start++;
-              } else if (index == (end - 1) && (end - 1) > 0) {
-                  end--;
-                  while(entries[(end - 1) * NUMBER_OF_ENTRIES] == null && (end - 1) > 0)
-                    end--;
-              }
+              updateStartAndEndPointer(index);
               return otherValue;
             }
         }
@@ -814,6 +796,21 @@ private final IRubyObject internalDeleteLinearSearch(final int hash, final Entry
         return null;
     }
 
+    private final void updateStartAndEndPointer(final int index) {
+      if (size == 0) {
+          start = 0;
+          end = 0;
+      } else if (index == start) {
+          start++;
+          while(entries[start * NUMBER_OF_ENTRIES] == null)
+            start++;
+      } else if (index == (end - 1) && (end - 1) > 0) {
+          end--;
+          while(entries[(end - 1) * NUMBER_OF_ENTRIES] == null && (end - 1) > 0)
+            end--;
+      }
+    }
+
     private final IRubyObject internalDelete(final int hash, final EntryMatchType matchType, final IRubyObject key, final IRubyObject value) {
         if (size == 0) return null;
         if (shouldSearchLinear()) {