From 627a66edb6791bdab5d6e0ef0caf0f56b5b7a35e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 11 Jan 2016 08:48:07 +0000
Subject: [PATCH] OPENDJ-2536 Add and use JCIP annotations jar

---
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
index 061b658..3bcd0e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014-2015 ForgeRock AS.
+ *      Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.server.replication.server.changelog.file;
 
@@ -46,6 +46,8 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import net.jcip.annotations.GuardedBy;
+
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.forgerock.util.Pair;
@@ -777,11 +779,8 @@
     }
   }
 
-  /**
-   * Abort all cursors opened on the provided log file.
-   * <p>
-   * @GuardedBy("exclusiveLock")
-   */
+  /** Abort all cursors opened on the provided log file. */
+  @GuardedBy("exclusiveLock")
   private void abortCursorsOpenOnLogFile(LogFile<K, V> logFile)
   {
     for (AbortableLogCursor<K, V> cursor : openCursors)
@@ -985,8 +984,8 @@
    * <p>
    * All cursors opened on this log are temporarily disabled (closing underlying resources)
    * and then re-open with their previous state.
-   * @GuardedBy("exclusiveLock")
    */
+  @GuardedBy("exclusiveLock")
   private void rotateHeadLogFile() throws ChangelogException
   {
     // Temporarily disable cursors opened on head, saving their state
@@ -1064,10 +1063,8 @@
        + recordParser.encodeKeyToString(highestKey) + LOG_FILE_SUFFIX;
   }
 
-  /**
-   * Update the cursors that were pointing to head after a rotation of the head log file.
-   * @GuardedBy("exclusiveLock")
-   */
+  /** Update the cursors that were pointing to head after a rotation of the head log file. */
+  @GuardedBy("exclusiveLock")
   private void updateOpenedCursorsOnHeadAfterRotation(List<Pair<AbortableLogCursor<K, V>, CursorState<K, V>>> cursors)
       throws ChangelogException
   {
@@ -1086,7 +1083,7 @@
     }
   }
 
-  /** @GuardedBy("exclusiveLock") */
+  @GuardedBy("exclusiveLock")
   private void abortAllOpenCursors() throws ChangelogException
   {
     for (AbortableLogCursor<K, V> cursor : openCursors)
@@ -1098,12 +1095,12 @@
   /**
    * Disable the cursors opened on the head log file log, by closing their underlying cursor.
    * Returns the state of each cursor just before the close operation.
-   * @GuardedBy("exclusiveLock")
    *
    * @return the pairs (cursor, cursor state) for each cursor pointing to head log file.
    * @throws ChangelogException
    *           If an error occurs.
    */
+  @GuardedBy("exclusiveLock")
   private List<Pair<AbortableLogCursor<K, V>, CursorState<K, V>>> disableOpenedCursorsOnHead()
       throws ChangelogException
   {
@@ -1173,7 +1170,7 @@
     return Log.HEAD_LOG_FILE_NAME.equals(logFile.getFile().getName());
   }
 
-  /** @GuardedBy("sharedLock") */
+  @GuardedBy("sharedLock")
   private LogFile<K, V> findLogFileFor(final K key, KeyMatchingStrategy keyMatchingStrategy) throws ChangelogException
   {
     if (key == null || logFiles.lowerKey(key) == null)
@@ -1577,35 +1574,35 @@
     /**
      * Aborts this cursor. Once aborted, a cursor throws an
      * AbortedChangelogCursorException if it is used.
-     * @GuardedBy("exclusiveLock")
      */
+    @GuardedBy("exclusiveLock")
     void abort()
     {
       mustAbort = true;
     }
 
-    /** @GuardedBy("exclusiveLock") */
+    @GuardedBy("exclusiveLock")
     @Override
     CursorState<K, V> getState() throws ChangelogException
     {
       return delegate.getState();
     }
 
-    /** @GuardedBy("exclusiveLock") */
+    @GuardedBy("exclusiveLock")
     @Override
     void closeUnderlyingCursor()
     {
       delegate.closeUnderlyingCursor();
     }
 
-    /** @GuardedBy("exclusiveLock") */
+    @GuardedBy("exclusiveLock")
     @Override
     void reinitializeTo(final CursorState<K, V> cursorState) throws ChangelogException
     {
       delegate.reinitializeTo(cursorState);
     }
 
-    /** @GuardedBy("exclusiveLock") */
+    @GuardedBy("exclusiveLock")
     @Override
     boolean isAccessingLogFile(LogFile<K, V> logFile)
     {

--
Gitblit v1.10.0