From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().

---
 opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
index fa6c12a..0bee1a1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -427,10 +427,8 @@
   {
     testSetUp("modifyConflicts");
     final DN dn1 = DN.valueOf("cn=test1," + baseDN);
-    final AttributeType attrType =
-         DirectoryServer.getAttributeType("displayname");
-    final AttributeType entryuuidType =
-         DirectoryServer.getAttributeType("entryuuid");
+    final AttributeType attrType = DirectoryServer.getAttributeTypeOrNull("displayname");
+    final AttributeType entryuuidType = DirectoryServer.getAttributeTypeOrNull("entryuuid");
     String monitorAttr = "resolved-modify-conflicts";
 
     /*

--
Gitblit v1.10.0