From 1f3592b4ab0a329ed8e54e311b89d2bca68efb81 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 21 Sep 2007 00:49:05 +0000
Subject: [PATCH] Update a number of result codes to make the values more consistent across operations. Also, eliminate a number of incorrect uses of the OPERATIONS_ERROR result and replace them with the more correct OTHER result.
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 8200408..8e1b78d 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -962,7 +962,7 @@
localOp.isSynchronizationOperation() ||
m.isInternal()))
{
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
localOp.appendErrorMessage(
ERR_MODIFY_ATTR_IS_OBSOLETE.get(String.valueOf(entryDN),
a.getName()));
@@ -5052,7 +5052,7 @@
}
else
{
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
localOp.appendErrorMessage(ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
String.valueOf(entryDN),
@@ -5094,7 +5094,7 @@
}
else
{
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
localOp.appendErrorMessage(
ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
@@ -5124,7 +5124,7 @@
}
else
{
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
localOp.appendErrorMessage(
ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
@@ -5166,7 +5166,7 @@
}
else
{
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
localOp.appendErrorMessage(
ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
@@ -5277,7 +5277,7 @@
ERR_ADD_NO_SUCH_PWPOLICY.get(String.valueOf(entryDN),
String.valueOf(policyDN)));
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
break addProcessing;
}
}
@@ -5450,7 +5450,7 @@
String.valueOf(entryDN),
at.getNameOrOID());
localOp.appendErrorMessage(message);
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
break addProcessing;
}
}
@@ -5463,7 +5463,7 @@
String.valueOf(entryDN),
at.getNameOrOID());
localOp.appendErrorMessage(message);
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
break addProcessing;
}
}
@@ -5476,7 +5476,7 @@
String.valueOf(entryDN),
oc.getNameOrOID());
localOp.appendErrorMessage(message);
- localOp.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ localOp.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
break addProcessing;
}
}
@@ -8166,7 +8166,7 @@
AttributeType at = newRDN.getAttributeType(i);
if (at.isObsolete())
{
- op.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
+ op.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
op.appendErrorMessage(ERR_MODDN_NEWRDN_ATTR_IS_OBSOLETE.get(
String.valueOf(entryDN),
at.getNameOrOID()));
--
Gitblit v1.10.0