From 67649485a8b644abfc3f0ab7890df02d6e9fe2e8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 22 Aug 2013 14:13:20 +0000
Subject: [PATCH] ReplicationIterator.java: Renamed releaseCursor() to close(). Now extends Closeable.
---
opends/src/server/org/opends/server/replication/server/MessageHandler.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index 2e4c5d2..d63b92e 100644
--- a/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -42,11 +42,13 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.protocol.UpdateMsg;
-import org.opends.server.replication.server.changelog.api.*;
+import org.opends.server.replication.server.changelog.api.ReplicationIterator;
+import org.opends.server.replication.server.changelog.api.ReplicationIteratorComparator;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* This class implements a buffering/producer/consumer mechanism of
@@ -308,7 +310,7 @@
}
finally
{
- releaseAllIterators(iteratorSortedSet);
+ close(iteratorSortedSet);
}
/*
@@ -411,7 +413,7 @@
}
else
{
- iter.releaseCursor();
+ close(iter);
}
}
@@ -461,7 +463,7 @@
result = null;
} finally
{
- releaseAllIterators(iteratorSortedSet);
+ close(iteratorSortedSet);
}
}
}
@@ -495,24 +497,13 @@
}
else
{
- iter.releaseCursor();
+ close(iter);
}
}
}
return results;
}
- private void releaseAllIterators(SortedSet<ReplicationIterator> iterators)
- {
- if (iterators != null)
- {
- for (ReplicationIterator iter : iterators)
- {
- iter.releaseCursor();
- }
- }
- }
-
/**
* Get the count of updates sent to this server.
* @return The count of update sent to this server.
--
Gitblit v1.10.0