From 831059a6c3ead1fb0ff858eff1a406b513c8e3ca Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Sun, 10 Aug 2025 07:41:26 +0000
Subject: [PATCH] [#540] Fix OnDiskMergeImporter::PhaseOneWriteableTransaction: update over put (referral attr) (#541)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 5 +++--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index f5404d3..50506e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -13,6 +13,7 @@
*
* Copyright 2007-2010 Sun Microsystems, Inc.
* Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2025 3A Systems, LLC
*/
package org.opends.server.backends.pluggable;
@@ -953,7 +954,7 @@
.getCoreConfigManager().getServerErrorResultCode(), ((LocalizableException) e).getMessageObject());
}
return new DirectoryException(serverContext
- .getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
+ .getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()==null?e.toString():e.getMessage()), e);
}
private RootContainer newRootContainer(AccessMode accessMode)
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 c87e13d..9f0b828 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
@@ -13,7 +13,7 @@
*
* Portions Copyright 2014 The Apache Software Foundation
* Copyright 2015-2016 ForgeRock AS.
- * Portions Copyright 2023-2024 3A Systems, LLC
+ * Portions Copyright 2023-2025 3A Systems, LLC
*/
package org.opends.server.backends.pluggable;
@@ -1353,7 +1353,8 @@
@Override
public boolean update(TreeName treeName, ByteSequence key, UpdateFunction f)
{
- throw new UnsupportedOperationException();
+ put(treeName,key,f.computeNewValue(null));
+ return true;
}
@Override
--
Gitblit v1.10.0