LocalBackend*Operation.java: Replaced use of BooleanHolder with AtomicBoole...

Jean-Noel Rouvignac

04.39.2014 bc09e934b9ef38957f563f7b34da85e8b2872860

LocalBackend*Operation.java:
Replaced use of BooleanHolder with AtomicBoolean (there is no penalty since there is no concurrency involved).

BooleanHolder.java: REMOVED
One class less to maintain.

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/BooleanHolder.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java

@@ -30,6 +30,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;

import org.forgerock.i18n.LocalizableMessage;
@@ -172,7 +173,7 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processAdd(clientConnection, executePostOpPlugins);

      PluginConfigManager pluginConfigManager =
@@ -186,7 +187,7 @@
          pluginConfigManager.invokePostSynchronizationAddPlugins(this);
        }
      }
      else if (executePostOpPlugins.value)
      else if (executePostOpPlugins.get())
      {
        // FIXME -- Should this also be done while holding the locks?
        PluginResult.PostOperation postOpResult =
@@ -225,7 +226,7 @@
  }

  private void processAdd(ClientConnection clientConnection,
      BooleanHolder executePostOpPlugins) throws CanceledOperationException
      AtomicBoolean executePostOpPlugins) throws CanceledOperationException
  {
    // Process the entry DN and set of attributes to convert them from their
    // raw forms as provided by the client to the forms required for the rest
@@ -452,7 +453,7 @@
      // Invoke the pre-operation add plugins.
      if (!isSynchronizationOperation())
      {
        executePostOpPlugins.value = true;
        executePostOpPlugins.set(true);
        PluginResult.PreOperation preOpResult =
            DirectoryServer.getPluginConfigManager()
                .invokePreOperationAddPlugins(this);

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java

@@ -28,6 +28,7 @@

import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;

import org.forgerock.i18n.LocalizableMessage;
@@ -132,14 +133,14 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processCompare(executePostOpPlugins);

      // Check for a request to cancel this operation.
      checkIfCanceled(false);

      // Invoke the post-operation compare plugins.
      if (executePostOpPlugins.value)
      if (executePostOpPlugins.get())
      {
        PluginResult.PostOperation postOpResult =
            DirectoryServer.getPluginConfigManager()
@@ -159,7 +160,7 @@
    }
  }

  private void processCompare(BooleanHolder executePostOpPlugins)
  private void processCompare(AtomicBoolean executePostOpPlugins)
      throws CanceledOperationException
  {
    // Process the entry DN to convert it from the raw form to the form
@@ -257,7 +258,7 @@


      // Invoke the pre-operation compare plugins.
      executePostOpPlugins.value = true;
      executePostOpPlugins.set(true);
      PluginResult.PreOperation preOpResult =
          DirectoryServer.getPluginConfigManager()
              .invokePreOperationComparePlugins(this);

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java

@@ -27,6 +27,7 @@
package org.opends.server.workflowelement.localbackend;

import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;

import org.forgerock.i18n.LocalizableMessage;
@@ -145,7 +146,7 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processDelete(executePostOpPlugins);

      // Invoke the post-operation or post-synchronization delete plugins.
@@ -158,7 +159,7 @@
          pluginConfigManager.invokePostSynchronizationDeletePlugins(this);
        }
      }
      else if (executePostOpPlugins.value)
      else if (executePostOpPlugins.get())
      {
        PluginResult.PostOperation postOpResult =
            pluginConfigManager.invokePostOperationDeletePlugins(this);
@@ -195,7 +196,7 @@
    }
  }

  private void processDelete(BooleanHolder executePostOpPlugins)
  private void processDelete(AtomicBoolean executePostOpPlugins)
      throws CanceledOperationException
  {
    // Process the entry DN to convert it from its raw form as provided by the
@@ -272,7 +273,7 @@
      // invoke the pre-delete plugins.
      if (!isSynchronizationOperation())
      {
        executePostOpPlugins.value = true;
        executePostOpPlugins.set(true);
        PluginResult.PreOperation preOpResult =
            DirectoryServer.getPluginConfigManager()
                .invokePreOperationDeletePlugins(this);

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java

@@ -29,6 +29,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;

import org.forgerock.i18n.LocalizableMessage;
@@ -184,7 +185,7 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processModifyDN(executePostOpPlugins);

      // Invoke the post-operation or post-synchronization modify DN plugins.
@@ -197,7 +198,7 @@
          pluginConfigManager.invokePostSynchronizationModifyDNPlugins(this);
        }
      }
      else if (executePostOpPlugins.value)
      else if (executePostOpPlugins.get())
      {
        PluginResult.PostOperation postOpResult =
            pluginConfigManager.invokePostOperationModifyDNPlugins(this);
@@ -234,7 +235,7 @@
    }
  }

  private void processModifyDN(BooleanHolder executePostOpPlugins)
  private void processModifyDN(AtomicBoolean executePostOpPlugins)
      throws CanceledOperationException
  {
    // Process the entry DN, newRDN, and newSuperior elements from their raw
@@ -423,7 +424,7 @@
        // to identify which changes were made after they're done.
        int modCount = modifications.size();

        executePostOpPlugins.value = true;
        executePostOpPlugins.set(true);
        PluginResult.PreOperation preOpResult =
            DirectoryServer.getPluginConfigManager()
                .invokePreOperationModifyDNPlugins(this);

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java

@@ -30,6 +30,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;

import org.forgerock.i18n.LocalizableMessage;
@@ -304,7 +305,7 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processModify(executePostOpPlugins);

      // If the password policy request control was included, then make sure we
@@ -325,7 +326,7 @@
          pluginConfigManager.invokePostSynchronizationModifyPlugins(this);
        }
      }
      else if (executePostOpPlugins.value)
      else if (executePostOpPlugins.get())
      {
        // FIXME -- Should this also be done while holding the locks?
        PluginResult.PostOperation postOpResult =
@@ -365,7 +366,7 @@
  }


  private void processModify(BooleanHolder executePostOpPlugins)
  private void processModify(AtomicBoolean executePostOpPlugins)
      throws CanceledOperationException
  {
    entryDN = getEntryDN();
@@ -537,7 +538,7 @@
      // Invoke the pre-operation modify plugins.
      if (!isSynchronizationOperation())
      {
        executePostOpPlugins.value = true;
        executePostOpPlugins.set(true);
        PluginResult.PreOperation preOpResult =
            DirectoryServer.getPluginConfigManager()
                .invokePreOperationModifyPlugins(this);

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java

@@ -27,6 +27,7 @@
package org.opends.server.workflowelement.localbackend;

import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.Backend;
@@ -104,14 +105,14 @@

    try
    {
      BooleanHolder executePostOpPlugins = new BooleanHolder(false);
      AtomicBoolean executePostOpPlugins = new AtomicBoolean(false);
      processSearch(executePostOpPlugins);

      // Check for a request to cancel this operation.
      checkIfCanceled(false);

      // Invoke the post-operation search plugins.
      if (executePostOpPlugins.value)
      if (executePostOpPlugins.get())
      {
        PluginResult.PostOperation postOpResult =
            DirectoryServer.getPluginConfigManager()
@@ -131,7 +132,7 @@
    }
  }

  private void processSearch(BooleanHolder executePostOpPlugins) throws CanceledOperationException
  private void processSearch(AtomicBoolean executePostOpPlugins) throws CanceledOperationException
  {
    // Process the search base and filter to convert them from their raw forms
    // as provided by the client to the forms required for the rest of the
@@ -187,7 +188,7 @@


    // Invoke the pre-operation search plugins.
    executePostOpPlugins.value = true;
    executePostOpPlugins.set(true);
    PluginResult.PreOperation preOpResult =
        DirectoryServer.getPluginConfigManager()
            .invokePreOperationSearchPlugins(this);