From 37ed5de0ba414a5cd097113e57e6e50468000001 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 06 Aug 2013 13:54:25 +0000
Subject: [PATCH] DraftCNDbIterator.java: In next(), got rid of an Exception that should not happen.
---
opends/src/server/org/opends/server/replication/server/DraftCNDbIterator.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DraftCNDbIterator.java b/opends/src/server/org/opends/server/replication/server/DraftCNDbIterator.java
index bcd9990..0f4ecfa 100644
--- a/opends/src/server/org/opends/server/replication/server/DraftCNDbIterator.java
+++ b/opends/src/server/org/opends/server/replication/server/DraftCNDbIterator.java
@@ -43,7 +43,7 @@
public class DraftCNDbIterator
{
private static final DebugTracer TRACER = getTracer();
- private DraftCNDBCursor draftCNDbCursor = null;
+ private DraftCNDBCursor draftCNDbCursor;
/**
* Creates a new ReplicationIterator.
@@ -93,8 +93,7 @@
{
try
{
- ChangeNumber cn = this.draftCNDbCursor.currentChangeNumber();
- return cn;
+ return this.draftCNDbCursor.currentChangeNumber();
}
catch(Exception e)
{
@@ -117,13 +116,15 @@
/**
* Skip to the next record of the database.
* @return true if has next, false elsewhere
- * @throws Exception When exception raised.
* @throws DatabaseException When database exception raised.
*/
- public boolean next()
- throws Exception, DatabaseException
+ public boolean next() throws DatabaseException
{
- return draftCNDbCursor.next();
+ if (draftCNDbCursor != null)
+ {
+ return draftCNDbCursor.next();
+ }
+ return false;
}
/**
--
Gitblit v1.10.0