From bc6df55e6de5967a511aa756aee6f330b254e4a8 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 09 Oct 2015 11:49:40 +0000
Subject: [PATCH] OPENDJ-1719: remove TreeName mangling for JE storage
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
index 1ef542b..13125c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
@@ -316,7 +316,7 @@
@Override
public void clearTree(TreeName treeName)
{
- env.truncateDatabase(null, mangleTreeName(treeName), false);
+ env.truncateDatabase(null, toDatabaseName(treeName), false);
}
@Override
@@ -488,7 +488,7 @@
synchronized (trees)
{
trees.remove(treeName);
- env.removeDatabase(txn, mangleTreeName(treeName));
+ env.removeDatabase(txn, toDatabaseName(treeName));
}
}
catch (DatabaseNotFoundException e)
@@ -609,7 +609,7 @@
tree = trees.get(treeName);
if (tree == null)
{
- tree = env.openDatabase(txn, mangleTreeName(treeName), dbConfig());
+ tree = env.openDatabase(txn, toDatabaseName(treeName), dbConfig());
trees.put(treeName, tree);
}
}
@@ -757,21 +757,9 @@
return new ImporterImpl();
}
- private static String mangleTreeName(final TreeName treeName)
+ private static String toDatabaseName(final TreeName treeName)
{
- StringBuilder mangled = new StringBuilder();
- String name = treeName.toString();
-
- for (int idx = 0; idx < name.length(); idx++)
- {
- char ch = name.charAt(idx);
- if (ch == '=' || ch == ',')
- {
- ch = '_';
- }
- mangled.append(ch);
- }
- return mangled.toString();
+ return treeName.toString();
}
@Override
--
Gitblit v1.10.0