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

Jean-Noel Rouvignac

15.40.2013 dddf9581158a611674bff908390d564c1c5eb07f

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

@@ -26,10 +26,6 @@
 *      Portions copyright 2013 ForgeRock AS
 */
package org.opends.server.tools;
import org.opends.messages.Message;



import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -40,6 +36,7 @@
import java.util.LinkedHashSet;
import java.util.LinkedList;

import org.opends.messages.Message;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.ldap.LDAPResultCode;
@@ -66,9 +63,9 @@
import org.opends.server.util.args.StringArgument;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;



@@ -153,25 +150,8 @@
  public static int mainSearch(String[] args, boolean initializeServer,
                               OutputStream outStream, OutputStream errStream)
  {
    PrintStream out;
    if (outStream == null)
    {
      out = NullOutputStream.printStream();
    }
    else
    {
      out = new PrintStream(outStream);
    }

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

    LinkedHashSet<String> scopeStrings = new LinkedHashSet<String>(4);
    scopeStrings.add(SCOPE_STRING_BASE);