From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 2093ca1..fea8161 100644
--- a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -220,7 +220,7 @@
if (conflictDN != null)
{
Message msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
- t.getNameOrOID(), v.getStringValue(),
+ t.getNameOrOID(), v.getValue().toString(),
conflictDN.toString());
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION, msg);
@@ -290,7 +290,7 @@
if (conflictDN != null)
{
Message msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
- t.getNameOrOID(), v.getStringValue(),
+ t.getNameOrOID(), v.getValue().toString(),
conflictDN.toString());
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION, msg);
@@ -337,7 +337,7 @@
if (conflictDN != null)
{
Message msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
- t.getNameOrOID(), v.getStringValue(),
+ t.getNameOrOID(), v.getValue().toString(),
conflictDN.toString());
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION, msg);
@@ -409,7 +409,7 @@
if (conflictDN != null)
{
Message msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
- t.getNameOrOID(), v.getStringValue(),
+ t.getNameOrOID(), v.getValue().toString(),
conflictDN.toString());
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION, msg);
@@ -472,7 +472,7 @@
t.getNameOrOID(),
addOperation.getConnectionID(),
addOperation.getOperationID(),
- v.getStringValue(),
+ v.getValue().toString(),
entry.getDN().toString(),
conflictDN.toString());
DirectoryServer.sendAlertNotification(this,
@@ -546,7 +546,7 @@
t.getNameOrOID(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
- v.getStringValue(),
+ v.getValue().toString(),
entryDN.toString(),
conflictDN.toString());
DirectoryServer.sendAlertNotification(this,
@@ -600,7 +600,7 @@
t.getNameOrOID(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
- v.getStringValue(),
+ v.getValue().toString(),
entryDN.toString(),
conflictDN.toString());
DirectoryServer.sendAlertNotification(this,
@@ -680,7 +680,7 @@
t.getNameOrOID(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
- v.getStringValue(),
+ v.getValue().toString(),
modifyDNOperation.getUpdatedEntry().getDN().toString(),
conflictDN.toString());
DirectoryServer.sendAlertNotification(this,
--
Gitblit v1.10.0