From 6e1a57e1c6e5450c0bc9320616416359a4e8a99a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Sep 2013 15:29:01 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index c5ec6bd..9c8c0c2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -632,34 +632,31 @@
}
ReplicaDBCursor cursor = rsd.getCursorFrom(serverId, previousCSN);
- if (cursor != null)
+ try
{
- try
- {
- int lookthroughCount = 0;
+ int lookthroughCount = 0;
- // Walk through the changes
- while (cursor.getChange() != null)
- {
- if (exportConfig != null && exportConfig.isCancelled())
- { // abort if cancelled
- return;
- }
- if (!canContinue(searchOperation, lookthroughCount))
- {
- break;
- }
- lookthroughCount++;
- writeChange(cursor.getChange(), ldifWriter, searchOperation,
- rsd.getBaseDN(), exportConfig != null);
- cursor.next();
- }
- }
- finally
+ // Walk through the changes
+ while (cursor.getChange() != null)
{
- close(cursor);
+ if (exportConfig != null && exportConfig.isCancelled())
+ { // abort if cancelled
+ return;
+ }
+ if (!canContinue(searchOperation, lookthroughCount))
+ {
+ break;
+ }
+ lookthroughCount++;
+ writeChange(cursor.getChange(), ldifWriter, searchOperation,
+ rsd.getBaseDN(), exportConfig != null);
+ cursor.next();
}
}
+ finally
+ {
+ close(cursor);
+ }
}
}
--
Gitblit v1.10.0