From 339d387276c1c297ead887f6af09488277f41c6b Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Apr 2015 20:19:59 +0000
Subject: [PATCH] SearchOperationBasis.java: Partial revert of r11027 for entriesSent and referencesSent fields going from AtomicInteger to int (as pointed out by Ludo).
---
opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
index affc470..91ed994 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -33,7 +33,6 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
@@ -140,12 +139,12 @@
private DN proxiedAuthorizationDN;
/** The number of entries that have been sent to the client. */
- private final AtomicInteger entriesSent = new AtomicInteger();
+ private int entriesSent;
/**
* The number of search result references that have been sent to the client.
*/
- private final AtomicInteger referencesSent = new AtomicInteger();
+ private int referencesSent;
/** The size limit for the search operation. */
private int sizeLimit;
@@ -474,14 +473,14 @@
@Override
public final int getEntriesSent()
{
- return entriesSent.get();
+ return entriesSent;
}
/** {@inheritDoc} */
@Override
public final int getReferencesSent()
{
- return referencesSent.get();
+ return referencesSent;
}
/** {@inheritDoc} */
@@ -720,7 +719,7 @@
{
sendSearchEntry(filteredSearchEntry);
- entriesSent.incrementAndGet();
+ entriesSent++;
}
catch (DirectoryException de)
{
@@ -791,7 +790,7 @@
{
if (sendSearchReference(reference))
{
- referencesSent.incrementAndGet();
+ referencesSent++;
// FIXME -- Should the size limit apply here?
}
--
Gitblit v1.10.0