From 67d407d20f1fec619b00433aeaa419976d9da05e Mon Sep 17 00:00:00 2001
From: floblanc <floblanc@localhost>
Date: Tue, 17 Feb 2009 15:13:32 +0000
Subject: [PATCH] Fix Issue 3796 A network group is still present in "cn=monitor" after deleting it.

---
 opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java           |    2 ++
 opends/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
index 3824919..070f764 100644
--- a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
+++ b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
@@ -1105,6 +1105,8 @@
     resourceLimitsPolicy = null;
     criteria = ConnectionCriteria.TRUE;
     policies.clear();
+    // Remove the stats
+    statistics.finalizeStatistics();
   }
 
 
diff --git a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
index b3041f8..58d2874 100644
--- a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
+++ b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
@@ -79,6 +79,14 @@
 
 
   /**
+   * Finalize the statistics.
+   */
+  public void finalizeStatistics() {
+    DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
+  }
+
+
+  /**
    * Increments the number of operations managed by this network group.
    * @param message The LDAP Message containing the operation to be
    * managed by the network group.

--
Gitblit v1.10.0