From a5789e69cf5ecfff3234af5b81dfd5fc3de6d1e3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 16 Apr 2015 14:49:54 +0000
Subject: [PATCH] CR-6653 OPENDJ-1878: re-implemented LockManager to support sub-tree write locking
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
index a367215..93e6400 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
@@ -49,7 +49,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.LockManager;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.ServerConstants;
@@ -117,7 +116,7 @@
private FIFOEntryCacheCfg registeredConfiguration;
/** The maximum length of time to try to obtain a lock before giving up. */
- private long lockTimeout = LockManager.DEFAULT_TIMEOUT;
+ private long lockTimeout = 2000;
/** Creates a new instance of this FIFO entry cache. */
public FIFOEntryCache()
@@ -850,7 +849,7 @@
* @return <CODE>true</CODE> if configuration is acceptable,
* or <CODE>false</CODE> otherwise.
*/
- public boolean processEntryCacheConfig(
+ private boolean processEntryCacheConfig(
FIFOEntryCacheCfg configuration,
boolean applyChanges,
EntryCacheCommon.ConfigErrorHandler errorHandler
--
Gitblit v1.10.0