You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2018/07/12 08:13:15 UTC
[directory-ldap-api] branch master updated: Removing ancient
leftovers
This is an automated email from the ASF dual-hosted git repository.
semancik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new 3063665 Removing ancient leftovers
3063665 is described below
commit 3063665b2c1af8429442576ec1611733f3980215
Author: Radovan Semancik <ra...@evolveum.com>
AuthorDate: Thu Jul 12 10:12:58 2018 +0200
Removing ancient leftovers
---
.../ldap/model/schema/registries/Registries.java | 49 ----------------------
1 file changed, 49 deletions(-)
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
index 7cdc0ad..cc0ab12 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
@@ -1832,55 +1832,6 @@ public class Registries implements SchemaLoaderListener, Cloneable
/**
- * Remove the given SchemaObject from the Map associating SchemaObjetcs to their
- * related Schema.
- *
- * TODO: IS THIS METHOD USED AT ALL? It seems to be some kind of leftover.
- *
- * @param schemaObject The schemaObject to remove
- * @throws LdapException If there is a problem
- */
- public void dissociateFromSchemaQuestionable( SchemaObject schemaObject ) throws LdapException
- {
- // And unregister the schemaObject within its schema
- Set<SchemaObjectWrapper> content = schemaObjects.get( Strings.toLowerCaseAscii( schemaObject.getSchemaName() ) );
-
- if ( content != null )
- {
- SchemaObjectWrapper schemaObjectWrapper = new SchemaObjectWrapper( schemaObject );
-
- if ( content.contains( schemaObjectWrapper ) )
- {
- // remove the schemaObject
- content.remove( schemaObjectWrapper );
-
- // Update the global OidRegistry if the SchemaObject is not
- // an instance of LoadableSchemaObject
- if ( !( schemaObject instanceof LoadableSchemaObject ) )
- {
- globalOidRegistry.unregister( schemaObject.getOid() );
- }
-
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( I18n.msg( I18n.MSG_13738_UNREGISTERED, schemaObject.getObjectType(), schemaObject.getOid() ) );
- }
- }
- else
- {
- // Not present !!
- // What should we do ?
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( I18n.msg( I18n.MSG_13740_UNREGISTERED_FAILED_NOT_FOUND, schemaObject.getObjectType() ),
- schemaObject.getOid() );
- }
- }
- }
- }
-
-
- /**
* Checks if a specific SchemaObject is referenced by any other SchemaObject.
*
* @param schemaObject The SchemaObject we are looking for