svn commit: r808192 - /directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java

[el...@apache.org]

Author: elecharny
Date: Wed Aug 26 21:40:30 2009
New Revision: 808192

URL: http://svn.apache.org/viewvc?rev=808192&view=rev
Log:
Fixed compilation errors

Modified:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=808192&r1=808191&r2=808192&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Wed Aug 26 21:40:30 2009
@@ -24,6 +24,7 @@
 
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -67,7 +68,7 @@
 
         if ( attr == null )
         {
-            String[] aliases = type.getNamesRef();
+            List<String> aliases = type.getNames();
 
             for ( String alias : aliases )
             {
@@ -210,9 +211,9 @@
         }
 
         // optimization bypass to avoid cost of the loop below
-        if ( type.getNamesRef().length == 1 )
+        if ( type.getNames().size() == 1 )
         {
-            attr = attrs.get( type.getNamesRef()[0] );
+            attr = attrs.get( type.getNames().get( 0 ) );
 
             if ( attr != null )
             {
@@ -221,7 +222,7 @@
         }
 
         // iterate through aliases
-        for ( String alias : type.getNamesRef() )
+        for ( String alias : type.getNames() )
         {
             attr = attrs.get( alias );
 
@@ -258,11 +259,11 @@
 
         if ( matchingRule != null )
         {
-            normalizer = type.getEquality().getNormalizer();
+            normalizer = matchingRule.getNormalizer();
         }
         else
         {
-            normalizer = new NoOpNormalizer( matchingRule.getOid() );
+            normalizer = new NoOpNormalizer( type.getOid() );
         }
 
         if ( type.getSyntax().isHumanReadable() )