Revert commit 6559 and complete commit 6550. There were some inconsistencie...

ludovicp

03.19.2010 32d694939d9deac5b4ef008855c2fe1dc97513a3

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

@@ -31,6 +31,7 @@
import java.io.IOException;
import java.net.ConnectException;
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
@@ -82,8 +83,8 @@
  private LDAPReader ldapReader;
  private int versionNumber = 3;

  private PrintStream out;
  private PrintStream err;
  private final PrintStream out;
  private final PrintStream err;

  /**
   * Constructor for the LDAPConnection object.
@@ -509,6 +510,24 @@
      throw new LDAPConnectionException(
              Message.raw(ex.getLocalizedMessage()),ex);
    }
    finally
    {
      if (timeout > 0)
      {
        try
        {
          socket.setSoTimeout(0);
        }
        catch (SocketException e)
        {
          e.printStackTrace();
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
        }
      }
    }

  }