You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by dj...@apache.org on 2007/08/18 09:36:49 UTC

svn commit: r567242 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java

Author: djencks
Date: Sat Aug 18 00:36:46 2007
New Revision: 567242

URL: http://svn.apache.org/viewvc?view=rev&rev=567242
Log:
DIRSERVER-1002 avoid NPE when shutting down server without credentials.  This does not provide proper security for shutting down the server, but does avoid a useless NPE

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?view=diff&rev=567242&r1=567241&r2=567242
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Sat Aug 18 00:36:46 2007
@@ -113,6 +113,7 @@
         if ( cfg instanceof ShutdownConfiguration )
         {
             service.shutdown();
+            return new DeadContext();
         }
         else if ( cfg instanceof SyncConfiguration )
         {