From 64afb3e53f74b2ec78cacb377858cb092e3a4e9b Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 16 Aug 2007 00:36:48 +0000
Subject: [PATCH] Update package-info.java files to include the @PublicAPI annotation to indicate whether any or all of the classes in that package are intended to be part of the public API.  Further, mark all classes that we intend to be part of the public API with the @PublicAPI annotation to indicate the ways in which they may be used.  Note that the use of these annotations and the ultimate determination as to what is in our public API and the ways in which those elements may be used still needs to be carefully reviewed before the 1.0 release.

---
 opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
index 594b6e6..a500207 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -36,6 +36,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -306,7 +307,7 @@
     // Obtain a lock on the cache.  If this fails, then don't do anything.
     try
     {
-      if (! cacheLock.tryLock(lockTimeout, TimeUnit.MILLISECONDS))
+      if (! cacheLock.tryLock(getLockTimeout(), TimeUnit.MILLISECONDS))
       {
         return;
       }
@@ -422,7 +423,7 @@
     // Obtain a lock on the cache.  If this fails, then don't do anything.
     try
     {
-      if (! cacheLock.tryLock(lockTimeout, TimeUnit.MILLISECONDS))
+      if (! cacheLock.tryLock(getLockTimeout(), TimeUnit.MILLISECONDS))
       {
         // We can't rule out the possibility of a conflict, so return false.
         return false;
@@ -943,11 +944,11 @@
       )
   {
     // Store the current value to detect changes.
-    long                  prevLockTimeout      = lockTimeout;
-    long                  prevMaxEntries       = maxEntries;
-    int                   prevMaxMemoryPercent = maxMemoryPercent;
-    HashSet<SearchFilter> prevIncludeFilters   = includeFilters;
-    HashSet<SearchFilter> prevExcludeFilters   = excludeFilters;
+    long              prevLockTimeout      = getLockTimeout();
+    long              prevMaxEntries       = maxEntries;
+    int               prevMaxMemoryPercent = maxMemoryPercent;
+    Set<SearchFilter> prevIncludeFilters   = getIncludeFilters();
+    Set<SearchFilter> prevExcludeFilters   = getExcludeFilters();
 
     // Activate the new configuration.
     ConfigChangeResult changeResult = applyConfigurationChange(configuration);
@@ -971,19 +972,19 @@
             INFO_FIFOCACHE_UPDATED_MAX_ENTRIES.get(maxEntries));
       }
 
-      if (lockTimeout != prevLockTimeout)
+      if (getLockTimeout() != prevLockTimeout)
       {
         changeResult.addMessage(
-            INFO_FIFOCACHE_UPDATED_LOCK_TIMEOUT.get(lockTimeout));
+            INFO_FIFOCACHE_UPDATED_LOCK_TIMEOUT.get(getLockTimeout()));
       }
 
-      if (!includeFilters.equals(prevIncludeFilters))
+      if (!getIncludeFilters().equals(prevIncludeFilters))
       {
         changeResult.addMessage(
             INFO_FIFOCACHE_UPDATED_INCLUDE_FILTERS.get());
       }
 
-      if (!excludeFilters.equals(prevExcludeFilters))
+      if (!getExcludeFilters().equals(prevExcludeFilters))
       {
         changeResult.addMessage(
             INFO_FIFOCACHE_UPDATED_EXCLUDE_FILTERS.get());
@@ -1071,12 +1072,13 @@
     if (applyChanges && errorHandler.getIsAcceptable())
     {
       configEntryDN    = newConfigEntryDN;
-      lockTimeout      = newLockTimeout;
       maxEntries       = newMaxEntries;
       maxMemoryPercent = newMaxMemoryPercent;
       maxAllowedMemory = newMaxAllowedMemory;
-      includeFilters   = newIncludeFilters;
-      excludeFilters   = newExcludeFilters;
+
+      setLockTimeout(newLockTimeout);
+      setIncludeFilters(newIncludeFilters);
+      setExcludeFilters(newExcludeFilters);
     }
 
     return errorHandler.getIsAcceptable();

--
Gitblit v1.10.0