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 2006/08/27 02:55:56 UTC
svn commit: r437263 - in /directory/trunks/apacheds:
core-unit/src/test/java/org/apache/directory/server/core/jndi/
core/src/main/java/org/apache/directory/server/core/
server-jndi/src/main/java/org/apache/directory/server/jndi/
server-unit/src/test/ja...
Author: akarasulu
Date: Sat Aug 26 17:55:55 2006
New Revision: 437263
URL: http://svn.apache.org/viewvc?rev=437263&view=rev
Log:
changes ...
o Fix for DIRSERVER-588
o Fix for DIRSERVER-589
o Fixed broken delete test after these changes
o Remove System.out.printlns from contributed test case
Modified:
directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/DelITest.java
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java?rev=437263&r1=437262&r2=437263&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java Sat Aug 26 17:55:55 2006
@@ -68,7 +68,6 @@
user.put( "sn", "Hamilton" );
sysRoot.createSubcontext( "uid=bob,ou=people", user );
- System.out.println( sysRoot.getNameInNamespace() );
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=437263&r1=437262&r2=437263&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Aug 26 17:55:55 2006
@@ -275,10 +275,10 @@
}
finally
{
+ serviceListener.afterShutdown( this );
environment = null;
interceptorChain = null;
startupConfiguration = null;
- serviceListener.afterShutdown( this );
}
}
Modified: directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?rev=437263&r1=437262&r2=437263&view=diff
==============================================================================
--- directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original)
+++ directory/trunks/apacheds/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Sat Aug 26 17:55:55 2006
@@ -416,6 +416,7 @@
ServerContextFactory.class.getClassLoader() ).getMethod( "init", new Class[]
{ ServerStartupConfiguration.class } ).invoke( null, new Object[]
{ cfg } );
+ ldapsStarted = true;
}
catch ( InvocationTargetException e )
{
@@ -464,7 +465,8 @@
((SocketSessionConfig)(acceptorCfg.getSessionConfig())).setTcpNoDelay( true );
tcpAcceptor.bind( new InetSocketAddress( port ), protocolProvider.getHandler(), acceptorCfg );
-
+ ldapStarted = true;
+
if ( log.isInfoEnabled() )
{
log.info( "Successful bind of an LDAP Service (" + port + ") is complete." );
Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/DelITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/DelITest.java?rev=437263&r1=437262&r2=437263&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/DelITest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/DelITest.java Sat Aug 26 17:55:55 2006
@@ -50,8 +50,8 @@
}
protected void tearDown() throws LDAPException, Exception {
- super.tearDown();
con.disconnect();
+ super.tearDown();
}
/**