You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/10/19 10:49:42 UTC
svn commit: r1024181 - in
/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api:
LdapConnection.java LdapNetworkConnection.java
Author: kayyagari
Date: Tue Oct 19 08:49:42 2010
New Revision: 1024181
URL: http://svn.apache.org/viewvc?rev=1024181&view=rev
Log:
o fixed schema loading which was accidentally commented in an earlier commit
o updated javadoc
Modified:
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1024181&r1=1024180&r2=1024181&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Tue Oct 19 08:49:42 2010
@@ -702,8 +702,8 @@ public interface LdapConnection
/**
- * Loads the default schema that is bundled in the API.
- *
+ * Loads all the default schemas that are bundled with the API.<br><br>
+ * <b>Note:</b> This method enables <b>all</b> schemas prior to loading
* @throws LdapException in case of problems while loading the schema
*/
void loadSchema() throws LdapException;
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1024181&r1=1024180&r2=1024181&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Tue Oct 19 08:49:42 2010
@@ -3125,6 +3125,14 @@ public class LdapNetworkConnection exten
try
{
JarLdifSchemaLoader jarSchemaLoader = new JarLdifSchemaLoader();
+
+ // we enable all the schemas so that need not check with server for enabled schemas
+ Collection<Schema> schemas = jarSchemaLoader.getAllSchemas();
+ for ( Schema s : schemas )
+ {
+ s.enable();
+ }
+
loadSchema( jarSchemaLoader );
}
catch( LdapException e )
@@ -3151,13 +3159,6 @@ public class LdapNetworkConnection exten
{
SchemaManager tmp = new DefaultSchemaManager( loader );
- // we enable all the schemas so that need not check with server for enabled schemas
- Collection<Schema> schemas = tmp.getLoader().getAllSchemas();
- for ( Schema s : schemas )
- {
- //s.enable();
- }
-
tmp.loadAllEnabled();
if ( !tmp.getErrors().isEmpty() )