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/EntryCacheConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
index da3d563..710b430 100644
--- a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -172,7 +172,7 @@
{
// Load the entry cache implementation class and install the entry
// cache with the server.
- String className = configuration.getEntryCacheClass();
+ String className = configuration.getJavaClass();
try
{
loadAndInstallEntryCache (className);
@@ -198,7 +198,7 @@
// Get the name of the class and make sure we can instantiate it as an
// entry cache.
- String className = configuration.getEntryCacheClass();
+ String className = configuration.getJavaClass();
try {
// Load the class but don't initialize it.
loadEntryCache(className, configuration, false);
@@ -242,7 +242,7 @@
// If the current entry cache is already enabled then we don't do
// anything unless the class has changed in which case we should
// indicate that administrative action is required.
- String newClassName = configuration.getEntryCacheClass();
+ String newClassName = configuration.getJavaClass();
if (_entryCache !=null)
{
String curClassName = _entryCache.getClass().getName();
@@ -286,7 +286,7 @@
{
// Get the name of the class and make sure we can instantiate it as
// an entry cache.
- String className = configuration.getEntryCacheClass();
+ String className = configuration.getJavaClass();
try
{
// Load the class but don't initialize it.
@@ -322,7 +322,7 @@
if (configuration.isEnabled())
{
// Instantiate the class as an entry cache and initialize it.
- String className = configuration.getEntryCacheClass();
+ String className = configuration.getJavaClass();
try
{
loadAndInstallEntryCache (className);
@@ -456,7 +456,7 @@
EntryCache<? extends EntryCacheCfg> cache;
definition = EntryCacheCfgDefn.getInstance();
- propertyDefinition = definition.getEntryCacheClassPropertyDefinition();
+ propertyDefinition = definition.getJavaClassPropertyDefinition();
cacheClass = propertyDefinition.loadClass(className, EntryCache.class);
// If there is some entry cache instance already initialized work with
--
Gitblit v1.10.0