From b506a6cd184bd8cf477f7d9a7f968c990f153528 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 Mar 2015 23:03:19 +0000
Subject: [PATCH] OPENDJ-1848 CR-6383: Remove Storage getRMW and putIfAbsent methods
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
index 06f3b20..23ac7ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
@@ -227,21 +227,10 @@
}
}
- private void store(final TreeName treeName, final byte[] key, final ByteStringBuilder value)
- throws DirectoryException
- {
- if (!putNoOverwrite(treeName, key, value))
- {
- final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_STORE_MULTIPLE_FAILURES.get();
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m);
- }
- }
-
- private boolean putNoOverwrite(final TreeName treeName, final byte[] key, final ByteStringBuilder value)
+ private boolean store(final TreeName treeName, final byte[] key, final ByteStringBuilder value)
throws DirectoryException
{
final ByteString keyEntry = ByteString.wrap(key);
- final ByteString valueEntry = ByteString.wrap(value.getBackingArray(), 0, value.length());
try
{
storage.write(new WriteOperation()
@@ -249,11 +238,7 @@
@Override
public void run(WriteableStorage txn) throws Exception
{
- if (!txn.putIfAbsent(treeName, keyEntry, valueEntry))
- {
- final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_STORE_STATUS.get(false);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m);
- }
+ txn.create(treeName, keyEntry, value);
}
});
return true;
--
Gitblit v1.10.0