1 files changed, 49 insertions, 21 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index fda8a6f2e9..1a119be32d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -31,6 +31,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.server.configuration.BrokerProperties;
@@ -145,7 +148,8 @@ public class FileBasedGroupProviderImpl
             GroupAdapter groupAdapter = new GroupAdapter(attrMap);
             principals.add(groupAdapter);
             groupAdapter.registerWithParents();
-            groupAdapter.open();
+            // TODO - we know this is safe, but the sync method shouldn't really be called from the management thread
+            groupAdapter.openAsync();
         }
 
     }
@@ -261,7 +265,7 @@ public class FileBasedGroupProviderImpl
     }
 
     @StateTransition( currentState = { State.UNINITIALIZED, State.QUIESCED, State.ERRORED }, desiredState = State.ACTIVE )
-    private void activate()
+    private ListenableFuture<Void> activate()
     {
         if (_groupDatabase != null)
         {
@@ -278,29 +282,48 @@ public class FileBasedGroupProviderImpl
                 throw new IllegalConfigurationException(String.format("Cannot load groups from '%s'", getPath()));
             }
         }
+        return Futures.immediateFuture(null);
     }
 
     @StateTransition( currentState = { State.QUIESCED, State.ACTIVE, State.ERRORED}, desiredState = State.DELETED )
-    private void doDelete()
+    private ListenableFuture<Void> doDelete()
     {
-        close();
-        File file = new File(getPath());
-        if (file.exists())
-        {
-            if (!file.delete())
-            {
-                throw new IllegalConfigurationException("Cannot delete group file");
-            }
-        }
-
-        deleted();
-        setState(State.DELETED);
+        final SettableFuture<Void> returnVal = SettableFuture.create();
+        closeAsync().addListener(
+                new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        try
+                        {
+                            File file = new File(getPath());
+                            if (file.exists())
+                            {
+                                if (!file.delete())
+                                {
+                                    throw new IllegalConfigurationException("Cannot delete group file");
+                                }
+                            }
+
+                            deleted();
+                            setState(State.DELETED);
+                        }
+                        finally
+                        {
+                            returnVal.set(null);
+                        }
+                    }
+                }, getTaskExecutor().getExecutor()
+                           );
+        return returnVal;
     }
 
     @StateTransition( currentState = State.UNINITIALIZED, desiredState = State.QUIESCED)
-    private void startQuiesced()
+    private ListenableFuture<Void> startQuiesced()
     {
         setState(State.QUIESCED);
+        return Futures.immediateFuture(null);
     }
 
     public Set<Principal> getGroupPrincipalsForUser(String username)
@@ -352,9 +375,10 @@ public class FileBasedGroupProviderImpl
         }
 
         @StateTransition( currentState = State.UNINITIALIZED, desiredState = State.ACTIVE )
-        private void activate()
+        private ListenableFuture<Void> activate()
         {
             setState(State.ACTIVE);
+            return Futures.immediateFuture(null);
         }
 
         @Override
@@ -371,7 +395,8 @@ public class FileBasedGroupProviderImpl
                 attrMap.put(GroupMember.NAME, principal.getName());
                 GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap);
                 groupMemberAdapter.registerWithParents();
-                groupMemberAdapter.open();
+                // todo - this will be safe, but the synchronous open should not be called from the management thread
+                groupMemberAdapter.openAsync();
                 members.add(groupMemberAdapter);
             }
             _groupPrincipal = new GroupPrincipal(getName());
@@ -432,11 +457,12 @@ public class FileBasedGroupProviderImpl
         }
 
         @StateTransition( currentState = State.ACTIVE, desiredState = State.DELETED )
-        private void doDelete()
+        private ListenableFuture<Void> doDelete()
         {
             _groupDatabase.removeGroup(getName());
             deleted();
             setState(State.DELETED);
+            return Futures.immediateFuture(null);
         }
 
         @Override
@@ -494,17 +520,19 @@ public class FileBasedGroupProviderImpl
             }
 
             @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.ACTIVE)
-            private void activate()
+            private ListenableFuture<Void> activate()
             {
                 setState(State.ACTIVE);
+                return Futures.immediateFuture(null);
             }
 
             @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
-            private void doDelete()
+            private ListenableFuture<Void> doDelete()
             {
                 _groupDatabase.removeUserFromGroup(getName(), GroupAdapter.this.getName());
                 deleted();
                 setState(State.DELETED);
+                return Futures.immediateFuture(null);
             }
 
             @Override