Fix OPENDJ-504: Performing Query on telephoneNumber attribute thats not a n...

Ludovic Poitou

29.24.2012 8fe1ba1bc5cc7623c5a29fff2025240a960627c9

Fix OPENDJ-504: Performing Query on telephoneNumber attribute thats not a number returns all entries.
Throw an exception when normalized value of a substring is empty, rather than using it.
Solves the use case described in the bug.

 opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2012 ForgeRock AS
 */
package org.opends.server.schema;

@@ -33,11 +34,13 @@

import java.util.Collection;
import java.util.Collections;
import org.opends.messages.Message;

import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.ByteSequence;
import org.opends.server.types.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;



@@ -182,7 +185,13 @@
  {
    // In this case, the logic used to normalize a substring is identical to the
    // logic used to normalize a full value.
    return normalizeValue(substring);
    ByteString value = normalizeValue(substring);
    if (value.length() == 0)
    {
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
          Message.EMPTY);
    }
    return value;
  }
}