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 2016/05/16 17:19:23 UTC
svn commit: r1744095 - in
/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model:
name/Rdn.java schema/PrepareString.java
Author: elecharny
Date: Mon May 16 17:19:23 2016
New Revision: 1744095
URL: http://svn.apache.org/viewvc?rev=1744095&view=rev
Log:
o Fixed the insignificantSpacesStringFinal handling
Modified:
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java?rev=1744095&r1=1744094&r2=1744095&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java Mon May 16 17:19:23 2016
@@ -1869,10 +1869,25 @@ public class Rdn implements Cloneable, E
default :
// Loop on all the Avas. As we have more than one,
// we have to order them by their AttributeType.
- /*if ( isSchemaAware() )
+ /*
+ if ( isSchemaAware() )
{
-
- }*/
+ for ( Ava otherAva : otherRdn )
+ {
+ List<Ava> attributeAvas = avaTypes.get( otherAva.getAttributeType().getOid() );
+ boolean found = false;
+
+ for ( Ava thisAva : attributeAvas )
+ {
+ if ( thisAva.compareTo( otherAva ) == 0 )
+ {
+ found = true;
+ break;
+ }
+ }
+ }
+ }
+ */
int pos = 0;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java?rev=1744095&r1=1744094&r2=1744095&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java Mon May 16 17:19:23 2016
@@ -4059,8 +4059,8 @@ public final class PrepareString
{
if ( origin == null )
{
- // Special case : a null strings is replaced by 2 spaces
- return " ";
+ // Special case : a null strings is replaced by 1 spaces
+ return " ";
}
int pos = 0;
@@ -4081,7 +4081,7 @@ public final class PrepareString
if ( pos == origin.length )
{
// We are done, it's an empty string
- return " ";
+ return " ";
}
char c = origin[pos];
@@ -4093,10 +4093,7 @@ public final class PrepareString
}
else
{
- // First add a space
- target[newPos++] = ' ';
-
- // Then the char
+ // Add the char
target[newPos++] = c;
pos++;
@@ -4137,7 +4134,7 @@ public final class PrepareString
if ( pos == origin.length )
{
// We are done, this is an empty String
- return " ";
+ return " ";
}
c = origin[pos];