From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.

---
 opends/src/server/org/opends/server/core/WorkQueueConfigManager.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/WorkQueueConfigManager.java b/opends/src/server/org/opends/server/core/WorkQueueConfigManager.java
index 0bcd2ec..0273bc8 100644
--- a/opends/src/server/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opends/src/server/org/opends/server/core/WorkQueueConfigManager.java
@@ -102,9 +102,9 @@
     // using that configuration.
     WorkQueueCfgDefn definition = WorkQueueCfgDefn.getInstance();
     ClassPropertyDefinition propertyDefinition =
-         definition.getWorkQueueClassPropertyDefinition();
+         definition.getJavaClassPropertyDefinition();
     Class<? extends WorkQueue> workQueueClass =
-         propertyDefinition.loadClass(workQueueConfig.getWorkQueueClass(),
+         propertyDefinition.loadClass(workQueueConfig.getJavaClass(),
                                       WorkQueue.class);
 
     try
@@ -120,7 +120,7 @@
     catch (Exception e)
     {
       Message message = ERR_CONFIG_WORK_QUEUE_INITIALIZATION_FAILED.
-          get(workQueueConfig.getWorkQueueClass(),
+          get(workQueueConfig.getJavaClass(),
               String.valueOf(workQueueConfig.dn()),
               stackTraceToSingleLineString(e));
       throw new InitializationException(message, e);
@@ -155,7 +155,7 @@
     // If the work queue class has been changed, then we should warn the user
     // that it won't take effect until the server is restarted.
     WorkQueue workQueue = DirectoryServer.getWorkQueue();
-    String workQueueClass = configuration.getWorkQueueClass();
+    String workQueueClass = configuration.getJavaClass();
     if (! workQueueClass.equals(workQueue.getClass().getName()))
     {
 

--
Gitblit v1.10.0