From e482d5615e9251d18b5ac036509fdcc3a72f7b01 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 25 Sep 2006 03:11:53 +0000
Subject: [PATCH] Fix a potential null pointer exception in the DN config attribute that could occur if it was created with a single DN value and that value is null.
---
opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
index 2869173..ece20d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -547,11 +547,17 @@
{
assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
-
- valueSet.add(new AttributeValue(new ASN1OctetString(value.toString()),
- new ASN1OctetString(value.toNormalizedString())));
+ LinkedHashSet<AttributeValue> valueSet;
+ if (value == null)
+ {
+ valueSet = new LinkedHashSet<AttributeValue>(0);
+ }
+ else
+ {
+ valueSet = new LinkedHashSet<AttributeValue>(1);
+ valueSet.add(new AttributeValue(new ASN1OctetString(value.toString()),
+ new ASN1OctetString(value.toNormalizedString())));
+ }
return valueSet;
}
--
Gitblit v1.10.0