You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/11/22 23:50:14 UTC
svn commit: r883175 - in /directory:
apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/
apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/
sha...
Author: elecharny
Date: Sun Nov 22 22:50:14 2009
New Revision: 883175
URL: http://svn.apache.org/viewvc?rev=883175&view=rev
Log:
Replaced reference to SchemaObject's INSTANCE by a direct call to the constructor
Modified:
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=883175&r1=883174&r2=883175&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Sun Nov 22 22:50:14 2009
@@ -61,10 +61,10 @@
private final LdapComparator<?> comparator;
/** The default byte[] comparator if no comparator has been defined */
- private static final Comparator<byte[]> BINARY_COMPARATOR = ByteArrayComparator.INSTANCE;
+ private static final Comparator<byte[]> BINARY_COMPARATOR = new ByteArrayComparator( null );
/** The default String comparator if no comparator has been defined */
- private static final Comparator<String> STRING_COMPARATOR = StringComparator.INSTANCE;
+ private static final Comparator<String> STRING_COMPARATOR = new StringComparator( null );
private final Index<T,ServerEntry> idx;
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=883175&r1=883174&r2=883175&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sun Nov 22 22:50:14 2009
@@ -701,7 +701,7 @@
names.add( "bogus" );
desc.setNames( names );
desc.setObsolete( false );
- schemaManager.register( at.getSyntax().getSyntaxChecker() );
+ //schemaManager.register( at.getSyntax().getSyntaxChecker() );
GreaterEqNode node = new GreaterEqNode( at.getOid(), new ServerStringValue( at, "3" ) );
new GreaterEqEvaluator( node, store, schemaManager );
@@ -714,7 +714,7 @@
{
MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( new BogusSyntax( 1 ) );
- mr.setLdapComparator( new StringComparator() );
+ mr.setLdapComparator( new StringComparator( "1.1" ) );
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
at.addName( "bogus" );
@@ -731,7 +731,7 @@
names.add( "bogus" );
desc.setNames( names );
desc.setObsolete( false );
- schemaManager.register( at.getSyntax().getSyntaxChecker() );
+ //schemaManager.register( at.getSyntax().getSyntaxChecker() );
GreaterEqNode node = new GreaterEqNode( at.getOid(), new ServerStringValue( at, "3" ) );
new GreaterEqEvaluator( node, store, schemaManager );
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=883175&r1=883174&r2=883175&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sun Nov 22 22:50:14 2009
@@ -748,7 +748,7 @@
{
MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( new BogusSyntax( 2 ) );
- mr.setLdapComparator( new StringComparator() );
+ mr.setLdapComparator( new StringComparator( "1.1" ) );
AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
at.addName( "bogus" );
@@ -765,7 +765,6 @@
names.add( "bogus" );
desc.setNames( names );
desc.setObsolete( false );
- schemaManager.register( at.getSyntax().getSyntaxChecker() );
LessEqNode node = new LessEqNode( at.getOid(), new ServerStringValue( at, "3" ) );
new LessEqEvaluator( node, store, schemaManager );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java?rev=883175&r1=883174&r2=883175&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java Sun Nov 22 22:50:14 2009
@@ -233,7 +233,7 @@
{
ClientBinaryValue binaryValue = ( ClientBinaryValue ) value;
- return ByteArrayComparator.INSTANCE.compare( getNormalizedValue(), binaryValue.getNormalizedValue() );
+ return new ByteArrayComparator( null ).compare( getNormalizedValue(), binaryValue.getNormalizedValue() );
}
String message = "I don't really know how to compare anything other " +