mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

pgamba
16.18.2008 3c28ac1da834ff4277acd90af6713bedf2fa2e85
Fix 3275 Start-up messages unaware of disabled replicated suffix's backend
5 files modified
24 ■■■■■ changed files
opends/src/messages/messages/replication.properties 2 ●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/core/DirectoryServer.java 11 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java 7 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java 3 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java 1 ●●●● patch | view | raw | blame | history
opends/src/messages/messages/replication.properties
@@ -198,7 +198,7 @@
SEVERE_ERR_SEARCHING_GENERATION_ID_73=An unexpected error %s occurred when \
searching for generation id for domain : %s
SEVERE_ERR_SEARCHING_DOMAIN_BACKEND_74=An unexpected error occurred when \
searching for the backend of the domain : %s
looking for the replicated backend : %s. It may be not configured or disabled
SEVERE_ERR_LOADING_GENERATION_ID_75=An unexpected error occurred when \
searching in %s for the generation ID  : %s
SEVERE_ERR_UPDATING_GENERATION_ID_76=An unexpected error %s occurred  \
opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -9572,6 +9572,17 @@
      Message message = ERR_DSCORE_CANNOT_START.get(ie.getMessage());
      shutDown(directoryServer.getClass().getName(), message);
    }
    catch (ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      Message message = ERR_DSCORE_CANNOT_START.get(ce.getMessage()
          + " " + ce.getCause().getLocalizedMessage());
      shutDown(directoryServer.getClass().getName(), message);
    }
    catch (Exception e)
    {
      Message message = ERR_DSCORE_CANNOT_START.get(
opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -403,6 +403,13 @@
      provider.initializeSynchronizationProvider(configuration);
    } catch (Exception e)
    {
      try
      {
        provider.finalizeSynchronizationProvider();
      }
      catch(Exception ce)
      {}
      // Handle the exception: put a message in the unacceptable reasons.
      Message message = ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
              String.valueOf(className), String.valueOf(configuration.dn()));
opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -500,7 +500,8 @@
      // Close the socket
      try
      {
        rmiSsf.close();
        if (rmiSsf != null)
          rmiSsf.close();
      }
      catch (IOException e)
      {
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -1018,6 +1018,7 @@
   */
  public void stop()
  {
    stopHeartBeat();
    replicationServer = "stopped";
    shutdown = true;
    connected = false;