From 513eb83896bf4654aa0e3628c2666e307712a8cc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 Dec 2013 14:47:03 +0000
Subject: [PATCH] ChangeNumberIndexer.java: In run(), made sure all cursors are properly closed, even in case of a RuntimeException terminating the thread. Moved resetNextChangeForInsertDBCursor() out of removeAllCursors(). In removeAllCursors(), closed the CompositeDBCursor.
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
index f502a7c..4402947 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
@@ -96,7 +96,15 @@
@Override
public boolean next() throws ChangelogException
{
- currentChange = cursor.next();
+ if (cursor != null)
+ {
+ currentChange = cursor.next();
+ }
+ else
+ {
+ currentChange = null;
+ }
+
if (currentChange != null)
{
--
Gitblit v1.10.0