From a632fbfad0ddbe8b343c6abe8e28dc41e3df9b7e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 10 Jul 2015 10:16:25 +0000
Subject: [PATCH] Code cleanup

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 5a0d634..3337d99 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -772,13 +772,7 @@
         }
         else
         {
-          AttributeType attrType  = DirectoryServer.getAttributeType(lowerName);
-          if (attrType == null)
-          {
-            attrType = DirectoryServer.getDefaultAttributeType(attrName);
-          }
-
-          excludeAttributes.add(attrType);
+          excludeAttributes.add(DirectoryServer.getAttributeType(lowerName, attrName));
         }
       }
     }
@@ -806,13 +800,7 @@
         }
         else
         {
-          AttributeType attrType  = DirectoryServer.getAttributeType(lowerName);
-          if (attrType == null)
-          {
-            attrType = DirectoryServer.getDefaultAttributeType(attrName);
-          }
-
-          includeAttributes.add(attrType);
+          includeAttributes.add(DirectoryServer.getAttributeType(lowerName, attrName));
         }
       }
     }

--
Gitblit v1.10.0