From b10a33c6e4b6e583b9bd2b31de7f04b5fe32d6c8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 Aug 2013 15:15:13 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
similarity index 98%
rename from opends/src/server/org/opends/server/replication/server/ReplicationDB.java
rename to opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index b3d89ba..287b243 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -25,7 +25,7 @@
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2013 ForgeRock AS
*/
-package org.opends.server.replication.server;
+package org.opends.server.replication.server.changelog.je;
import java.io.Closeable;
import java.io.UnsupportedEncodingException;
@@ -37,6 +37,8 @@
import org.opends.messages.MessageBuilder;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.UpdateMsg;
+import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.replication.server.ReplicationServerDomain;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.util.StaticUtils;
@@ -212,7 +214,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
finally
{
@@ -220,12 +222,6 @@
}
}
- private void handleUnexpectedDatabaseException(DatabaseException e)
- {
- ChangelogException ex = new ChangelogException(e);
- replicationServer.handleUnexpectedChangelogException(ex);
- }
-
private void insertCounterRecordIfNeeded(ChangeNumber changeNumber)
throws DatabaseException
{
@@ -373,7 +369,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
return null;
}
finally
@@ -432,7 +428,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
return null;
}
finally
@@ -493,7 +489,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
finally
{
@@ -717,7 +713,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
}
}
@@ -750,7 +746,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
}
}
@@ -956,7 +952,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
finally
{
--
Gitblit v1.10.0