From 4ed3b08887c800fb6f02ecc90df9092691b78208 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 30 Mar 2016 08:51:11 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index bb6c3ec..7af4b2a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -924,8 +924,7 @@
           }
           else
           {
-            LocalizableMessage message =
-                ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription().getNameOrOID());
+            LocalizableMessage message = ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription());
             throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
           }
 
@@ -935,8 +934,7 @@
         case DELETE:
           if (a.isEmpty())
           {
-            LocalizableMessage message =
-                ERR_SCHEMA_MODIFY_DELETE_NO_VALUES.get(a.getAttributeDescription().getNameOrOID());
+            LocalizableMessage message = ERR_SCHEMA_MODIFY_DELETE_NO_VALUES.get(a.getAttributeDescription());
             throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
           }
 
@@ -1081,8 +1079,7 @@
           }
           else
           {
-            LocalizableMessage message =
-                ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription().getNameOrOID());
+            LocalizableMessage message = ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription());
             throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
           }
 
@@ -3478,10 +3475,7 @@
                 DirectoryServer.getServerErrorResultCode(),
                 ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
           }
-          else
-          {
-            continue;
-          }
+          continue;
         }
 
         importEntry(e);

--
Gitblit v1.10.0