From 1fa46f4ad2b9034c2149857f210e93b9c15e6e82 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 22 Apr 2009 06:25:36 +0000
Subject: [PATCH] SEC-1104: Added check of "running" flag in stop() method to
 prevent stopping twice.

---
 .../security/ldap/server/ApacheDSContainer.java               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
index 74d839f802..525bb88b13 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
@@ -183,6 +183,10 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
 
     @SuppressWarnings("unchecked")
     public void stop() {
+        if (!isRunning()) {
+            return;
+        }
+
         Properties env = new Properties();
         env.setProperty(Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName());
         env.setProperty(Context.SECURITY_AUTHENTICATION, "simple");