Fix a problem in the network group design that prevented the server from re...

neil_a_wilson

16.31.2007 f2e967d7d3df9d1b712650a6c321741ad3c827a3

Fix a problem in the network group design that prevented the server from
restarting correctly when performing an in-core restart.  Also, eliminate a
potential null pointer exception if an admin alert was generated early in the
server startup process.

OpenDS Issue Number:  1518

 opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java

@@ -8343,6 +8343,10 @@
    }


    // Deregister all network group configuration.
    NetworkGroup.deregisterAll();


    // Log a final message indicating that the server is stopped (which should
    // be true for all practical purposes), and then shut down all the error
    // loggers.

 opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroup.java

@@ -579,4 +579,17 @@
    return sb;
  }


  /**
   * Deregisters all network groups that have been registered.  This should be
   * called when the server is shutting down.
   */
  public static void deregisterAll()
  {
    synchronized (registeredNetworkGroupsLock)
    {
      registeredNetworkGroups = new TreeMap<String,NetworkGroup>();
      defaultNetworkGroup = new NetworkGroup ("default");
    }
  }
}

 opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java

@@ -166,8 +166,11 @@
      }
    }

    configuration.addChangeListener(this);
    currentConfig = configuration;
    if (configuration != null)
    {
      configuration.addChangeListener(this);
      currentConfig = configuration;
    }
  }