directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r982171 - in /directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi: ServerContext.java ServerDirContext.java
Date Wed, 04 Aug 2010 09:16:36 GMT
Author: kayyagari
Date: Wed Aug  4 09:16:35 2010
New Revision: 982171

URL: http://svn.apache.org/viewvc?rev=982171&view=rev
Log:
o fixed an issue related to the values used after normalizing the DN
o fixed an issue related to adding user provided values

Modified:
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=982171&r1=982170&r2=982171&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
(original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
Wed Aug  4 09:16:35 2010
@@ -756,7 +756,7 @@ public abstract class ServerContext impl
 
         if ( rdn != null )
         {
-            if ( SchemaConstants.CN_AT.equals( rdn.getNormType() ) )
+            if ( SchemaConstants.CN_AT_OID.equals( rdn.getNormType() ) )
             {
                 serverEntry.put( rdn.getUpType(), rdn.getUpValue() );
             }
@@ -1561,6 +1561,7 @@ public abstract class ServerContext impl
         // Add to left hand side of cloned DN the relative name arg
         try
         {
+            relativeName.normalize( schemaManager.getNormalizerMapping() );
             target = target.addAllNormalized( target.size(), relativeName );
         }
         catch (LdapInvalidDnException lide )

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=982171&r1=982170&r2=982171&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
(original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Wed Aug  4 09:16:35 2010
@@ -575,7 +575,7 @@ public abstract class ServerDirContext e
         if ( rdn.size() == 1 )
         {
             String rdnAttribute = rdn.getUpType();
-            String rdnValue = rdn.getNormValue().getString();
+            String rdnValue = rdn.getUpValue().getString();
 
             // Add the RDN attribute
             boolean doRdnPut = attributes.get( rdnAttribute ) == null;
@@ -604,7 +604,7 @@ public abstract class ServerDirContext e
 
                 if ( doRdnPut )
                 {
-                    attributes.put( atav.getNormType(), atav.getNormValue().get() );
+                    attributes.put( atav.getNormType(), atav.getUpValue().get() );
                 }
             }
         }



Mime
View raw message