From ccf889e78b4a540e88c56c84646aa330788d4f00 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 19 Jun 2009 12:20:11 +0000
Subject: [PATCH] Avoid a NullPointerException when modifying an entry containing attributes not defined in the schema (such as the entries under cn=admin data).
---
opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index ad24b54..980edbe 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -62,6 +62,7 @@
import org.opends.messages.AdminToolMessages;
import org.opends.messages.Message;
import org.opends.server.config.ConfigConstants;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
/**
@@ -507,6 +508,11 @@
}
AttributeType attrType = schema.getAttributeType(
attr.getName().toLowerCase());
+ if (attrType == null)
+ {
+ attrType = DirectoryServer.getDefaultAttributeType(
+ attr.getName().toLowerCase());
+ }
Set<AttributeValue> newValues = new LinkedHashSet<AttributeValue>();
Iterator<AttributeValue> it = attr.iterator();
while (it.hasNext())
--
Gitblit v1.10.0