Merge ASN1 branch to trunk

matthew_swift

05.42.2009 22094368c2865dcfb6daf8366425212b721a4657

 opends/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java

@@ -29,6 +29,7 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ByteString;

import java.util.Comparator;
import java.io.Serializable;
@@ -282,12 +283,12 @@
        break;
      }

      byte[] b1Bytes = set.getValue((index * orderingRules.length) + j);
      byte[] b2Bytes = null;
      ByteString b1Bytes = set.getValue((index * orderingRules.length) + j);
      ByteString b2Bytes = null;

      if(values[j] != null)
      {
        b2Bytes = values[j].getNormalizedValueBytes();
        b2Bytes = values[j].getNormalizedValue();
      }

      // A null value will always come after a non-null value.
@@ -310,11 +311,11 @@
      int result;
      if(ascending[j])
      {
        result = orderingRules[j].compare(b1Bytes, b2Bytes);
        result = orderingRules[j].compareValues(b1Bytes, b2Bytes);
      }
      else
      {
        result = orderingRules[j].compare(b2Bytes, b1Bytes);
        result = orderingRules[j].compareValues(b2Bytes, b1Bytes);
      }

      if(result != 0)