From 67ec87eb408ac99daf73234bc6590669a38bf11b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 12 Aug 2025 06:57:04 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-12
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 5 +++--
opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 3 ++-
opendj-doc-generated-ref/pom.xml | 2 +-
opendj-core/pom.xml | 1 -
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 797cd9b..680ffd4 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -91,7 +91,6 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
<!-- BC FIPS Provider libs -->
<dependency>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 428bdbb..8e6821f 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -13,7 +13,7 @@
~ information: "Portions Copyright [year] [name of copyright owner]".
~
~ Copyright 2016 ForgeRock AS.
- ~ Portions Copyright 2024 3A Systems LLC.
+ ~ Portions Copyright 2024-2025 3A Systems LLC.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
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
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index 4e5d5f6..6192516 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -63,7 +63,7 @@
private static final PlatformIMPL IMPL;
/** The minimum java supported version. */
- public static final String JAVA_MINIMUM_VERSION_NUMBER = "7.0";
+ public static final String JAVA_MINIMUM_VERSION_NUMBER = "8";
static
{
--
Gitblit v1.10.0