Enhancement to fix for issue 2499. Added nanosecond processing time method ...

boli

18.37.2008 5d6b56353ce3a2816410052d4b2b531c0c676c06

 opends/src/server/org/opends/server/core/SearchOperationBasis.java

@@ -627,9 +627,8 @@

    // See if the time limit has expired.  If so, then don't send the entry and
    // indicate that the search should end.
    if ((getTimeLimit() > 0) &&
        ((getUseNanoTime() ? TimeThread.getNanoTime() :
                             TimeThread.getTime()) >= getTimeLimitExpiration()))
    if ((getTimeLimit() > 0) && (TimeThread.getTime() >=
                                                getTimeLimitExpiration()))
    {
      setResultCode(ResultCode.TIME_LIMIT_EXCEEDED);
      appendErrorMessage(ERR_SEARCH_TIME_LIMIT_EXCEEDED.get(getTimeLimit()));
@@ -1055,9 +1054,8 @@

    // See if the time limit has expired.  If so, then don't send the entry and
    // indicate that the search should end.
    if ((getTimeLimit() > 0) &&
        ((getUseNanoTime() ? TimeThread.getNanoTime() :
                             TimeThread.getTime()) >= getTimeLimitExpiration()))
    if ((getTimeLimit() > 0) && (TimeThread.getTime() >=
                                                getTimeLimitExpiration()))
    {
      setResultCode(ResultCode.TIME_LIMIT_EXCEEDED);
      appendErrorMessage(ERR_SEARCH_TIME_LIMIT_EXCEEDED.get(getTimeLimit()));
@@ -1625,8 +1623,8 @@
    else
    {
      // FIXME -- Factor in the user's effective time limit.
      timeLimitExpiration = getProcessingStartTime() +
          ((getUseNanoTime() ? 1000000000L : 1000L) * timeLimit);
      timeLimitExpiration =
        getProcessingStartTime() + (1000L * timeLimit);
    }
    setTimeLimitExpiration(timeLimitExpiration);