From 4ea91789ca6aa8c976213ecc821aeda683f88872 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 04 Jun 2013 14:15:10 +0000
Subject: [PATCH] Initial work for re-opened OPENDJ-866: Local RS is named differently to remote RS under.

---
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 4043202..5e104a7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -407,11 +407,8 @@
       }
     }
 
-    DirectoryServer.deregisterMonitorProvider(
-        rootContainerMonitor.getMonitorInstanceName());
-
-    DirectoryServer.deregisterMonitorProvider(
-        diskMonitor.getMonitorInstanceName());
+    DirectoryServer.deregisterMonitorProvider(rootContainerMonitor);
+    DirectoryServer.deregisterMonitorProvider(diskMonitor);
 
     // We presume the server will prevent more operations coming into this
     // backend, but there may be existing operations already in the
@@ -1764,7 +1761,6 @@
 
   /**
    * {@inheritDoc}
-   * @param monitor
    */
   public void diskLowThresholdReached(DiskSpaceMonitor monitor) {
     Message msg = ERR_JEB_DISK_LOW_THRESHOLD_REACHED.get(
@@ -1777,7 +1773,6 @@
 
   /**
    * {@inheritDoc}
-   * @param monitor
    */
   public void diskFullThresholdReached(DiskSpaceMonitor monitor) {
     Message msg = ERR_JEB_DISK_FULL_THRESHOLD_REACHED.get(
@@ -1790,7 +1785,6 @@
 
   /**
    * {@inheritDoc}
-   * @param monitor
    */
   public void diskSpaceRestored(DiskSpaceMonitor monitor) {
     Message msg = NOTE_JEB_DISK_SPACE_RESTORED.get(monitor.getFreeSpace(),

--
Gitblit v1.10.0