From 403af8c0ce27e7351186613aff92c362924da357 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 07 Jan 2008 19:45:19 +0000
Subject: [PATCH] Fix issue 2462: NPE when changing index configuration while import ongoing

---
 opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java b/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
index 89103c6..2b970a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
  */
 
 package org.opends.server.admin.server;
@@ -185,6 +185,7 @@
         ConfigChangeListenerAdaptor<?> adaptor =
           (ConfigChangeListenerAdaptor<?>) l;
         if (adaptor.getConfigurationChangeListener() == listener) {
+          adaptor.finalizeChangeListener();
           configEntry.deregisterChangeListener(adaptor);
         }
       }

--
Gitblit v1.10.0