From fc1aa420ce7640cd874e6700188c7b7a133ccd4d 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
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
similarity index 96%
rename from opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java
rename to opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
index 5d7db0d..07161e0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -25,7 +25,7 @@
* Copyright 2009 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.util.concurrent.locks.ReadWriteLock;
@@ -35,6 +35,7 @@
import org.opends.messages.MessageBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.types.DebugLogLevel;
@@ -127,11 +128,11 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
catch (ChangelogException e)
{
- replicationServer.handleUnexpectedChangelogException(e);
+ dbenv.shutdownOnException(e);
}
}
@@ -255,7 +256,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
return 0;
}
}
@@ -323,17 +324,11 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
return 0;
}
}
- private void handleUnexpectedDatabaseException(DatabaseException e)
- {
- ChangelogException ex = new ChangelogException(e);
- replicationServer.handleUnexpectedChangelogException(ex);
- }
-
/**
* {@inheritDoc}
*/
@@ -514,7 +509,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
}
}
@@ -547,7 +542,7 @@
}
catch (DatabaseException e)
{
- handleUnexpectedDatabaseException(e);
+ dbenv.shutdownOnException(e);
}
}
}
--
Gitblit v1.10.0