From 9df0c0351216575123c607a39c5c7ec453bae64b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 29 Apr 2025 07:55:53 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index f041f38..c87e13d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -1510,7 +1510,7 @@
mmapPosition = region.offset;
mmap = channel.map(MapMode.READ_ONLY, mmapPosition, Math.min(size.get() - mmapPosition, Integer.MAX_VALUE));
}
- final ByteBuffer regionBuffer = mmap.duplicate();
+ final ByteBuffer regionBuffer = ((ByteBuffer)mmap).duplicate();
final int relativeRegionOffset = (int) (region.offset - mmapPosition);
regionBuffer.position(relativeRegionOffset).limit(regionBuffer.position() + region.size);
cursors.add(new FileRegion.Cursor(name, regionBuffer.slice()));
@@ -3036,7 +3036,7 @@
void writeByteSequence(int position, ByteSequence data)
{
- buffer.position(position);
+ ((ByteBuffer)buffer).position(position);
data.copyTo(buffer);
}
--
Gitblit v1.10.0