From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 :  initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...

---
 opends/resource/bin/stop-ds.bat |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/opends/resource/bin/stop-ds.bat b/opends/resource/bin/stop-ds.bat
index 43cd8a2..a51ac12 100644
--- a/opends/resource/bin/stop-ds.bat
+++ b/opends/resource/bin/stop-ds.bat
@@ -23,7 +23,7 @@
 rem CDDL HEADER END
 rem
 rem
-rem      Copyright 2006-2009 Sun Microsystems, Inc.
+rem      Copyright 2006-2010 Sun Microsystems, Inc.
 
 setlocal
 
@@ -74,12 +74,12 @@
 if %errorlevel% == 103 goto stopAsWindowsService
 if %errorlevel% == 104 goto restartAsWindowsService
 rem An error or we display usage
-goto end
+goto writeLastLine
 
 :serverAlreadyStopped
 echo %SCRIPT%: server already stopped >> %LOG%
 if exist "%INSTANCE_ROOT%\logs\server.pid" erase "%INSTANCE_ROOT%\logs\server.pid"
-goto end
+goto writeLastLine
 
 :startUsingSystemCall
 echo %SCRIPT%: start using system call >> %LOG%
@@ -90,7 +90,7 @@
 set OPENDS_JAVA_HOME=%ORIGINAL_JAVA_HOME%
 set OPENDS_JAVA_BIN=%ORIGINAL_JAVA_BIN%
 "%INSTALL_ROOT%\bat\start-ds.bat"
-goto end
+goto writeLastLine
 
 :stopUsingSystemCall
 echo %SCRIPT%: stop using system call >> %LOG%
@@ -125,6 +125,8 @@
 if exist "%INSTANCE_ROOT%\logs\winservice.out" erase "%INSTANCE_ROOT%\logs\winservice.out"
 goto end
 
-:end
-
+:writeLastLine
 echo %SCRIPT%: finished >> %LOG%
+goto end
+
+:end

--
Gitblit v1.10.0