Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 12B2A9D42 for ; Thu, 10 Nov 2011 15:04:15 +0000 (UTC) Received: (qmail 10961 invoked by uid 500); 10 Nov 2011 15:04:15 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 10929 invoked by uid 500); 10 Nov 2011 15:04:15 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 10922 invoked by uid 99); 10 Nov 2011 15:04:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 15:04:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 15:04:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4FDB23888EA for ; Thu, 10 Nov 2011 15:03:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200361 - /directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java Date: Thu, 10 Nov 2011 15:03:51 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110150351.A4FDB23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Nov 10 15:03:51 2011 New Revision: 1200361 URL: http://svn.apache.org/viewvc?rev=1200361&view=rev Log: Made the UUID comparator accept either UUID or Strings Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java?rev=1200361&r1=1200360&r2=1200361&view=diff ============================================================================== --- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java (original) +++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java Thu Nov 10 15:03:51 2011 @@ -19,7 +19,6 @@ */ package org.apache.directory.shared.ldap.model.schema.comparators; - import org.apache.directory.shared.ldap.model.schema.LdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +29,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class UUIDComparator extends LdapComparator +public class UUIDComparator extends LdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; @@ -51,7 +50,7 @@ public class UUIDComparator extends Ldap /** * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ - public int compare( String uuid1, String uuid2 ) + public int compare( Object uuid1, Object uuid2 ) { LOG.debug( "comparing UUID objects '{}' with '{}'", uuid1, uuid2 ); @@ -68,6 +67,9 @@ public class UUIDComparator extends Ldap return 1; } - return uuid1.compareTo( uuid2 ); + String uuidStr1 = uuid1.toString(); + String uuidStr2 = uuid2.toString(); + + return uuidStr1.compareTo( uuidStr2 ); } }