From f0a048d41a13eca4cba405da9403c2469ca3d1ea Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 05 May 2015 14:18:24 +0000
Subject: [PATCH] OPENDJ-1849 CR-6835 Remove references to JE from pluggable backend
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index 9a23d94..ba2cbf5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -28,7 +28,7 @@
import static org.forgerock.util.Reject.*;
import static org.forgerock.util.Utils.*;
-import static org.opends.messages.JebMessages.*;
+import static org.opends.messages.BackendMessages.*;
import static org.opends.server.core.DirectoryServer.*;
import java.io.IOException;
@@ -123,9 +123,9 @@
{
// Get the format version.
byte formatVersion = bytes.byteAt(0);
- if(formatVersion != JebFormat.FORMAT_VERSION)
+ if(formatVersion != DnKeyFormat.FORMAT_VERSION)
{
- throw DecodeException.error(ERR_JEB_INCOMPATIBLE_ENTRY_VERSION.get(formatVersion));
+ throw DecodeException.error(ERR_INCOMPATIBLE_ENTRY_VERSION.get(formatVersion));
}
// Read the ASN1 sequence.
@@ -184,7 +184,7 @@
entry.encode(entryBuffer, dataConfig.getEntryEncodeConfig());
// First write the DB format version byte.
- encodedBuffer.append(JebFormat.FORMAT_VERSION);
+ encodedBuffer.append(DnKeyFormat.FORMAT_VERSION);
try
{
@@ -397,8 +397,7 @@
}
catch (Exception e)
{
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- ERR_JEB_ENTRY_DATABASE_CORRUPT.get(id));
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), ERR_ENTRY_DATABASE_CORRUPT.get(id));
}
}
--
Gitblit v1.10.0