diff options
Diffstat (limited to 'qpid/java/bdbstore/src')
2 files changed, 5 insertions, 17 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java index 6f03dc51df..58105cddc1 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java @@ -94,6 +94,7 @@ public class BDBHAReplicaVirtualHost extends AbstractConfiguredObject<BDBHARepli _dataDelivered = new StatisticsCounter("bytes-delivered-" + getName()); _messagesReceived = new StatisticsCounter("messages-received-" + getName()); _dataReceived = new StatisticsCounter("bytes-received-" + getName()); + setState(State.UNAVAILABLE); } @Override @@ -151,12 +152,6 @@ public class BDBHAReplicaVirtualHost extends AbstractConfiguredObject<BDBHARepli } @Override - public State getState() - { - return State.UNAVAILABLE; - } - - @Override public Collection<String> getExchangeTypeNames() { return getObjectFactory().getSupportedTypes(Exchange.class); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java index 537c89bfc7..dfbdce4399 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java @@ -60,7 +60,6 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB @ManagedAttributeField(afterSet="afterSetRole") private volatile NodeRole _role; - private final AtomicReference<State> _state; private final boolean _isMonitor; private BDBHAVirtualHostNodeLogSubject _virtualHostNodeLogSubject; private GroupLogSubject _groupLogSubject; @@ -72,7 +71,7 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB _broker = virtualHostNode.getParent(Broker.class); _address = (String)attributes.get(ADDRESS); _replicatedEnvironmentFacade = replicatedEnvironmentFacade; - _state = new AtomicReference<>(State.ACTIVE); + setState(State.ACTIVE); _role = NodeRole.UNREACHABLE; _lastKnownRole = NodeRole.UNREACHABLE; @@ -81,12 +80,6 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB } @Override - public State getState() - { - return _state.get(); - } - - @Override public String getGroupName() { return _replicatedEnvironmentFacade.getGroupName(); @@ -166,7 +159,7 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB try { _replicatedEnvironmentFacade.removeNodeFromGroup(nodeName); - _state.set(State.DELETED); + setState(State.DELETED); deleted(); } catch(MasterStateException e) @@ -243,14 +236,14 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB private void updateModelStateFromRole(NodeRole role) { - State currentState = _state.get(); + State currentState = getState(); if (currentState == State.DELETED) { return; } boolean isActive = NodeRole.MASTER == role || NodeRole.REPLICA == role; - _state.compareAndSet(currentState, isActive ? State.ACTIVE : State.UNAVAILABLE); + setState(isActive ? State.ACTIVE : State.UNAVAILABLE); } @Override |