QPID-7972: [Broker-J] Put VirtualHostNode in ERRORed state if the

underlying VirtualHost is
apache · Feb 20, 2018 · edefbbc · edefbbc
1 parent 3aad3e3
commit edefbbc
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/...src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/...src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
@@ -31,6 +31,7 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.server.model.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -102,19 +103,15 @@ protected ListenableFuture<Void> activate()
         if (host != null)
         {
             final QueueManagingVirtualHost<?> recoveredHost = host;
-            final ListenableFuture<Void> openFuture;
             recoveredHost.setFirstOpening(isNew && initialRecords.length == 0);
-            openFuture = Subject.doAs(getSubjectWithAddedSystemRights(),
-                                      new PrivilegedAction<ListenableFuture<Void>>()
-                                      {
-                                          @Override
-                                          public ListenableFuture<Void> run()
-                                          {
-                                              return recoveredHost.openAsync();
-
-                                          }
-                                      });
-            return openFuture;
+
+            final ListenableFuture<Void> openFuture = Subject.doAs(getSubjectWithAddedSystemRights(), (PrivilegedAction<ListenableFuture<Void>>) recoveredHost::openAsync);
+            return doAfter(openFuture, () -> {
+                if (getVirtualHost().getState() == State.ERRORED ) 
+                {
+                    throw new IllegalStateException(String.format("This virtual host node has %s children", State.ERRORED));
+                }
+            });
         }
         else
         {