From d7c2353c5f18cd9445217fc2e8c08fdd25824e65 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Sun, 11 Oct 2026 15:40:11 +0000
Subject: [PATCH] Merge branch 'master' into vharseko-patch-1

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
index ed60bc1..d740649 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
@@ -44,6 +44,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.forgerock.opendj.ldap.DN;
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -1212,7 +1213,7 @@
 
       db.initialize();
       volume = db.loadVolume(VOLUME_NAME);
-      monitor = new PDBMonitor(config.getBackendId() + " PDB Database", db);
+      monitor = new PDBMonitor(DN.escapeAttributeValue(config.getBackendId()) + " PDB Database", db);
       DirectoryServer.registerMonitorProvider(monitor);
     }
     catch(final InUseException e) {

--
Gitblit v1.10.0