You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/06/08 11:01:14 UTC
qpid-broker-j git commit: QPID-7616: [Java Broker] Start
virtualhostnode's virtualHostExecutor in open phase
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 4b4f1cd75 -> 9c149b3af
QPID-7616: [Java Broker] Start virtualhostnode's virtualHostExecutor in open phase
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/9c149b3a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/9c149b3a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/9c149b3a
Branch: refs/heads/master
Commit: 9c149b3af6a5c25ed85ada346d6eaa24b926a5a3
Parents: 4b4f1cd
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jun 7 18:39:31 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Jun 8 12:00:56 2017 +0100
----------------------------------------------------------------------
.../AbstractVirtualHostNode.java | 30 +++++++++-----------
1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9c149b3a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
index ed7c06a..0ba7df0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
@@ -26,7 +26,6 @@ import java.io.Reader;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -45,9 +44,9 @@ import com.google.common.util.concurrent.SettableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.exchange.ExchangeDefaults;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
@@ -98,7 +97,7 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
private MessageStoreLogSubject _configurationStoreLogSubject;
- private TaskExecutor _virtualHostExecutor;
+ private volatile TaskExecutor _virtualHostExecutor;
@ManagedAttributeField
private boolean _defaultVirtualHostNode;
@@ -112,20 +111,6 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
public AbstractVirtualHostNode(Broker<?> parent, Map<String, Object> attributes)
{
super(parent, attributes);
- _virtualHostExecutor = getTaskExecutor().getFactory().newInstance("VirtualHostNode-" + getName() + "-Config", new TaskExecutor.PrincipalAccessor()
- {
- @Override
- public Principal getPrincipal()
- {
- VirtualHost<?> virtualHost = getVirtualHost();
- if (virtualHost != null)
- {
- return virtualHost.getPrincipal();
- }
- return null;
- }
- });
- _virtualHostExecutor.start();
_broker = parent;
SystemConfig<?> systemConfig = getAncestor(SystemConfig.class);
_eventLogger = systemConfig.getEventLogger();
@@ -135,6 +120,17 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
public void onOpen()
{
super.onOpen();
+ _virtualHostExecutor = getTaskExecutor().getFactory().newInstance("VirtualHostNode-" + getName() + "-Config",
+ () ->
+ {
+ VirtualHost<?> virtualHost = getVirtualHost();
+ if (virtualHost != null)
+ {
+ return virtualHost.getPrincipal();
+ }
+ return null;
+ });
+ _virtualHostExecutor.start();
_durableConfigurationStore = createConfigurationStore();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org