From 45a8024fe68e7bc451a5a22afcaf31e7edb745a1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 12 Aug 2013 15:22:03 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/ECLServerHandler.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 1a30bf9..704aec6 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -27,12 +27,6 @@
*/
package org.opends.server.replication.server;
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.replication.protocol.ProtocolVersion.*;
-import static org.opends.server.replication.protocol.StartECLSessionMsg.*;
-
import java.io.IOException;
import java.util.*;
import java.util.concurrent.Semaphore;
@@ -47,10 +41,15 @@
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
+import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.types.*;
import org.opends.server.util.ServerConstants;
-import com.sleepycat.je.DatabaseException;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.replication.protocol.ProtocolVersion.*;
+import static org.opends.server.replication.protocol.StartECLSessionMsg.*;
/**
* This class defines a server handler, which handles all interaction with a
@@ -579,11 +578,11 @@
* the start draftCN coming from the request filter.
* @return the cookie corresponding to the passed in startDraftCN.
* @throws Exception
- * if a general problem occurred
+ * if a database problem occurred
* @throws DirectoryException
* if a database problem occurred
*/
- private String findCookie(int startDraftCN) throws Exception,
+ private String findCookie(int startDraftCN) throws ChangelogException,
DirectoryException
{
DraftCNDbHandler draftCNDb = replicationServer.getDraftCNDbHandler();
@@ -1454,7 +1453,7 @@
+ " cn=" + draftCNDbIter.getChangeNumber()
+ " End of draftCNDb ?" + isEndOfDraftCNReached);
}
- catch (DatabaseException e)
+ catch (ChangelogException e)
{
if (debugEnabled())
{
--
Gitblit v1.10.0