From 9c9fa99f8549fb523cb252d70a347cf2dc301ad5 Mon Sep 17 00:00:00 2001
From: Alan Paxton <alan.paxton@gmail.com>
Date: Tue, 30 May 2023 08:51:29 +0100
Subject: [PATCH] Repair a mis-step in rebase.

---
 java/src/test/java/org/rocksdb/MergeTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/src/test/java/org/rocksdb/MergeTest.java b/java/src/test/java/org/rocksdb/MergeTest.java
index f99ac49d3dd..10ffeb7788b 100644
--- a/java/src/test/java/org/rocksdb/MergeTest.java
+++ b/java/src/test/java/org/rocksdb/MergeTest.java
@@ -45,14 +45,14 @@ public void stringOption()
     }
   }
 
-  private byte[] longToByteArray(final long l) {
+  static byte[] longToByteArray(final long l) {
     final ByteBuffer buf =
         ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN);
     buf.putLong(l);
     return buf.array();
   }
 
-  private long longFromByteArray(final byte[] a) {
+  static long longFromByteArray(final byte[] a) {
     final ByteBuffer buf =
         ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN);
     buf.put(a);