From d9c030fe499b0c596023e50577b30158e6c5b7c3 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 10 Apr 2009 22:56:07 +0000
Subject: [PATCH] Fix for issue 3925 (dsreplication is broken) Check that the ClassLoaderProvider is not enabled before enabling it.
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 5 ++++-
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 3040d85..b51a813 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -125,7 +125,7 @@
super();
/* Do some initialization required to use the administration framework
- * classes. Note that this is not done in the installer code because
+ * classes. Note that this is not done in the uninstaller code because
* when the basic configuration of the server is performed (using
* ConfigureDS) this initialization is done.
*/
@@ -133,7 +133,10 @@
// Bootstrap definition classes.
try
{
- ClassLoaderProvider.getInstance().enable();
+ if (!ClassLoaderProvider.getInstance().isEnabled())
+ {
+ ClassLoaderProvider.getInstance().enable();
+ }
}
catch (Throwable t)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 2787a50..fc5106b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -396,7 +396,10 @@
// Bootstrap definition classes.
try
{
- ClassLoaderProvider.getInstance().enable();
+ if (!ClassLoaderProvider.getInstance().isEnabled())
+ {
+ ClassLoaderProvider.getInstance().enable();
+ }
// Switch off class name validation in client.
ClassPropertyDefinition.setAllowClassValidation(false);
--
Gitblit v1.10.0