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/28 08:09:00 UTC
svn commit: r1745851 -
/directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g
Author: elecharny
Date: Sat May 28 08:09:00 2016
New Revision: 1745851
URL: http://svn.apache.org/viewvc?rev=1745851&view=rev
Log:
Have the UserClass using a Normalized Dn String instead of a Dn, avoiding a lot of Dn comparisons
Modified:
directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g
Modified: directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g?rev=1745851&r1=1745850&r2=1745851&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g (original)
+++ directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g Sat May 28 08:09:00 2016
@@ -966,7 +966,7 @@ parentOfEntry
name
{
log.debug( "entered name()" );
- Set<Dn> names = new HashSet<Dn>();
+ Set<String> names = new HashSet<>();
Dn distinguishedName = null;
}
:
@@ -974,11 +974,11 @@ name
OPEN_CURLY ( SP )*
distinguishedName=distinguishedName ( SP )*
{
- names.add( distinguishedName );
+ names.add( distinguishedName.getNormName() );
}
( SEP ( SP )* distinguishedName=distinguishedName ( SP )*
{
- names.add( distinguishedName );
+ names.add( distinguishedName.getNormName() );
} )*
CLOSE_CURLY
{
@@ -989,7 +989,7 @@ name
userGroup
{
log.debug( "entered userGroup()" );
- Set<Dn> userGroup = new HashSet<Dn>();
+ Set<String> userGroup = new HashSet<>();
Dn distinguishedName = null;
}
:
@@ -997,11 +997,11 @@ userGroup
OPEN_CURLY ( SP )*
distinguishedName=distinguishedName ( SP )*
{
- userGroup.add( distinguishedName );
+ userGroup.add( distinguishedName.getNormName() );
}
( SEP ( SP )* distinguishedName=distinguishedName ( SP )*
{
- userGroup.add( distinguishedName );
+ userGroup.add( distinguishedName.getNormName() );
} )*
CLOSE_CURLY
{