Created NullOutputStream.wrapOrNullStream() and used it in all tools instea...

Jean-Noel Rouvignac

15.41.2013 3783fa744d21bd485d9bb08a7f3256ac56768566

Created NullOutputStream.wrapOrNullStream() and used it in all tools instead of duplicating the null checks everywhere.

 opends/src/server/org/opends/server/tools/InstallDS.java

@@ -305,27 +305,11 @@
  public static int mainCLI(String[] args,
      OutputStream outStream, OutputStream errStream, InputStream inStream)
  {
    PrintStream out;
    if (outStream == null)
    {
      out = NullOutputStream.printStream();
    }
    else
    {
      out = new PrintStream(outStream);
    }
    PrintStream out = NullOutputStream.wrapOrNullStream(outStream);

    System.setProperty(Constants.CLI_JAVA_PROPERTY, "true");

    PrintStream err;
    if (errStream == null)
    {
      err = NullOutputStream.printStream();
    }
    else
    {
      err = new PrintStream(errStream);
    }
    PrintStream err = NullOutputStream.wrapOrNullStream(errStream);

    try {
      QuickSetupLog.initLogFileHandler(
@@ -568,6 +552,7 @@
    installer.setProgressMessageFormatter(formatter);
    installer.addProgressUpdateListener(
        new ProgressUpdateListener() {
          @Override
          public void progressUpdate(ProgressUpdateEvent ev) {
            if (ev.getNewLogs() != null)
            {