You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/03/31 16:53:35 UTC
svn commit: r643009 - in /directory:
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/
installers/branches/bigbang/apac...
Author: akarasulu
Date: Mon Mar 31 07:53:32 2008
New Revision: 643009
URL: http://svn.apache.org/viewvc?rev=643009&view=rev
Log:
Fix for DIRSERVER-1047.
Modified:
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
directory/installers/branches/bigbang/apacheds-noarch/log4j.properties
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=643009&r1=643008&r2=643009&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Mon Mar 31 07:53:32 2008
@@ -42,11 +42,11 @@
/**
* Creates a new instance of UnbindOperationContext.
*
- * @param unbindDn The principal DN to unbind
+ * @param principalDn The principal DN to unbind
*/
- public UnbindOperationContext( Registries registries, LdapDN unbindDn )
+ public UnbindOperationContext( Registries registries, LdapDN principalDn )
{
- super( registries, unbindDn );
+ super( registries, principalDn );
}
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=643009&r1=643008&r2=643009&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Mon Mar 31 07:53:32 2008
@@ -232,19 +232,7 @@
*/
public void ldapUnbind() throws NamingException
{
- LdapDN principalDn;
- Object principalDnValue = getEnvironment().get( Context.SECURITY_PRINCIPAL );
-
- if ( principalDnValue instanceof LdapDN )
- {
- principalDn = ( LdapDN ) principalDnValue;
- }
- else
- {
- String bindDn = ( String ) principalDnValue;
- principalDn = new LdapDN( bindDn );
- }
-
+ LdapDN principalDn = super.getPrincipal().getJndiName();
UnbindOperationContext opCtx = new UnbindOperationContext( registries, principalDn );
opCtx.addRequestControls( requestControls );
super.getNexusProxy().unbind( opCtx );
Modified: directory/installers/branches/bigbang/apacheds-noarch/log4j.properties
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/log4j.properties?rev=643009&r1=643008&r2=643009&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/log4j.properties (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/log4j.properties Mon Mar 31 07:53:32 2008
@@ -37,8 +37,5 @@
log4j.logger.org.apache.directory.shared.codec=WARN
log4j.logger.org.apache.directory.shared.asn1=WARN
-# Remove me when the unbind problem has gone away:
-# https://issues.apache.org/jira/browse/DIRSERVER-1047
-log4j.logger.org.apache.directory.server.ldap.support.UnbindHandler=OFF
log4j.logger.org.apache.directory.server.schema.registries=WARN