From 9529c418255af8de0cceb952afd006b60b9927a1 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 15:02:54 +0000
Subject: [PATCH] Make CustomSearchResult closer to SDK's Entry
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index aebb0fb..cc575a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -475,7 +475,8 @@
rdnAttribute = sr.getName().rdn().getFirstAVA().getAttributeType().getNameOrOID();
updateDNValue();
- boolean hasPassword = !sr.getAttributeValues(ATTR_USER_PASSWORD).isEmpty();
+ Attribute userPwdAttr = sr.getAttribute(ATTR_USER_PASSWORD);
+ boolean hasPassword = userPwdAttr != null && !userPwdAttr.isEmpty();
lPassword.setVisible(hasPassword);
password.setVisible(hasPassword);
lconfirmPassword.setVisible(hasPassword);
--
Gitblit v1.10.0