Author: pamarcelot
Date: Tue Dec 21 14:01:33 2010
New Revision: 1051495
URL: http://svn.apache.org/viewvc?rev=1051495&view=rev
Log:
Fixed an issue with entries having empty or wrong DNs with a JNDI based connection wrapper.
Modified:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1051495&r1=1051494&r2=1051495&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
Tue Dec 21 14:01:33 2010
@@ -294,7 +294,7 @@ public class LoadConfigurationRunnable i
// Creating the 'ou=config' base entry
SearchResult searchResult = ( SearchResult ) enumeration.next();
configEntry = new DefaultEntry( schemaManager, AttributeUtils.toClientEntry(
- searchResult.getAttributes(), new DN( searchResult.getName() ) ) );
+ searchResult.getAttributes(), new DN( searchResult.getNameInNamespace()
) ) );
}
enumeration.close();
@@ -341,7 +341,7 @@ public class LoadConfigurationRunnable i
// Creating the child entry
SearchResult searchResult = ( SearchResult ) childrenEnumeration.next();
Entry childEntry = new DefaultEntry( schemaManager, AttributeUtils.toClientEntry(
- searchResult.getAttributes(), new DN( searchResult.getName() ) )
);
+ searchResult.getAttributes(), new DN( searchResult.getNameInNamespace()
) ) );
// Adding the children to the list of entries
entries.add( childEntry );
|