From a837c0600e8855892427c493e164147a8f68d6f4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 13 Jul 2009 09:20:24 +0000
Subject: [PATCH] Fix for issue 4106 (dsreplication should allow to merge disjoint replication topologies) dsreplication allows to merge disjoint topologies. The limitations on the topologies that can be merged are described in the issue report.
---
opends/src/ads/org/opends/admin/ads/ADSContextException.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ADSContextException.java b/opends/src/ads/org/opends/admin/ads/ADSContextException.java
index b8139c6..ffc57d9 100644
--- a/opends/src/ads/org/opends/admin/ads/ADSContextException.java
+++ b/opends/src/ads/org/opends/admin/ads/ADSContextException.java
@@ -108,6 +108,10 @@
*/
UNEXPECTED_ADS_BACKEND_TYPE(),
/**
+ * Error merging with another ADSContext.
+ */
+ ERROR_MERGING,
+ /**
* Unexpected error (potential bug).
*/
ERROR_UNEXPECTED();
@@ -133,7 +137,19 @@
*/
public ADSContextException(ErrorType error, Throwable x)
{
- super(getMessage(error, x), x);
+ this(error, getMessage(error, x), x);
+ }
+
+ /**
+ * Creates an ADSContextException of the given error type with the provided
+ * error cause and message.
+ * @param error the error type.
+ * @param msg the message describing the error.
+ * @param x the throwable that generated this exception.
+ */
+ public ADSContextException(ErrorType error, Message msg, Throwable x)
+ {
+ super(msg);
this.error = error;
this.embeddedException = x;
toString = "ADSContextException: error type "+error+".";
--
Gitblit v1.10.0