From 38afdba5a37f3a89ca59c8dca9376919fbb41ce5 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 19 Sep 2007 00:31:06 +0000
Subject: [PATCH] More changes relating to issue 1449: aggregation support.

---
 opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java
index 668d495..8b90e8e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java
@@ -76,6 +76,7 @@
 import org.opends.server.admin.client.ManagedObject;
 import org.opends.server.admin.client.ManagedObjectDecodingException;
 import org.opends.server.admin.client.OperationRejectedException;
+import org.opends.server.admin.client.OperationRejectedException.OperationType;
 import org.opends.server.admin.client.spi.Driver;
 import org.opends.server.admin.client.spi.PropertySet;
 import org.opends.server.admin.std.client.RootCfgClient;
@@ -422,11 +423,15 @@
       connection.deleteSubtree(dn);
     } catch (OperationNotSupportedException e) {
       // Unwilling to perform.
+      AbstractManagedObjectDefinition<?, ?> d =
+        path.getManagedObjectDefinition();
       if (e.getMessage() == null) {
-        throw new OperationRejectedException();
+        throw new OperationRejectedException(OperationType.DELETE, d
+            .getUserFriendlyName());
       } else {
         Message m = Message.raw("%s", e.getMessage());
-        throw new OperationRejectedException(m);
+        throw new OperationRejectedException(OperationType.DELETE, d
+            .getUserFriendlyName(), m);
       }
     } catch (NamingException e) {
       adaptNamingException(e);

--
Gitblit v1.10.0