Fixed a issue created in revision 3977 where messages are printed twice whe...

boli

19.31.2008 1f164e01309bb6f2bdf7ad3e0dc9f8ec969e63b0

 opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java

@@ -39,6 +39,7 @@
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.api.DebugLogPublisher;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import static org.opends.server.config.ConfigConstants.*;
@@ -46,8 +47,11 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.ThreadFilterTextErrorLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.TextErrorLogPublisher;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.server.loggers.debug.DebugLogger;

import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.types.AttributeType;
@@ -90,8 +94,6 @@
   */
  public static final int LDIF_BUFFER_SIZE = 1048576;

  private static ErrorLogPublisher errorLogPublisher = null;


  /**
   * The main method for ImportLDIF tool.
@@ -102,11 +104,6 @@
  {
    int retCode = mainImportLDIF(args, true, System.out, System.err);

    if(errorLogPublisher != null)
    {
      removeErrorLogPublisher(errorLogPublisher);
    }

    if(retCode != 0)
    {
      System.exit(filterExitCode(retCode));
@@ -763,20 +760,21 @@

      if (! quietMode.isPresent())
      {
        // FIXME -- Install a custom logger to capture information about the
        // state of the import.
        try
        {
          errorLogPublisher =
              new ThreadFilterTextErrorLogPublisher(Thread.currentThread(),
                                                    new TextWriter.STREAM(out));
          addErrorLogPublisher(errorLogPublisher);

          ErrorLogPublisher errorLogPublisher =
              TextErrorLogPublisher.getStartupTextErrorPublisher(
                  new TextWriter.STREAM(out));
          DebugLogPublisher debugLogPublisher =
              TextDebugLogPublisher.getStartupTextDebugPublisher(
                  new TextWriter.STREAM(out));
          ErrorLogger.addErrorLogPublisher(errorLogPublisher);
          DebugLogger.addDebugLogPublisher(debugLogPublisher);
        }
        catch(Exception e)
        {
          err.println("Error installing the custom error logger: " +
                      stackTraceToSingleLineString(e));
              stackTraceToSingleLineString(e));
        }
      }