ARTEMIS-2221 Fix Merge

This commit is contained in:
Michael André Pearce 2019-01-17 23:50:09 +00:00
parent 3a0491b920
commit dac2ae6636
1 changed files with 3 additions and 3 deletions

View File

@ -123,7 +123,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
public String[] getQueueNames() throws Exception { public String[] getQueueNames() throws Exception {
clearIO(); clearIO();
try { try {
Bindings bindings = postOffice.lookupBindingsForAddress(addressInfo.getName()); Bindings bindings = server.getPostOffice().lookupBindingsForAddress(addressInfo.getName());
if (bindings != null) { if (bindings != null) {
List<String> queueNames = new ArrayList<>(); List<String> queueNames = new ArrayList<>();
for (Binding binding : bindings.getBindings()) { for (Binding binding : bindings.getBindings()) {
@ -146,7 +146,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
public String[] getBindingNames() throws Exception { public String[] getBindingNames() throws Exception {
clearIO(); clearIO();
try { try {
Bindings bindings = postOffice.lookupBindingsForAddress(addressInfo.getName()); Bindings bindings = server.getPostOffice().lookupBindingsForAddress(addressInfo.getName());
if (bindings != null) { if (bindings != null) {
String[] bindingNames = new String[bindings.getBindings().size()]; String[] bindingNames = new String[bindings.getBindings().size()];
int i = 0; int i = 0;
@ -235,7 +235,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
clearIO(); clearIO();
long totalMsgs = 0; long totalMsgs = 0;
try { try {
Bindings bindings = postOffice.lookupBindingsForAddress(addressInfo.getName()); Bindings bindings = server.getPostOffice().lookupBindingsForAddress(addressInfo.getName());
if (bindings != null) { if (bindings != null) {
for (Binding binding : bindings.getBindings()) { for (Binding binding : bindings.getBindings()) {
if (binding instanceof QueueBinding) { if (binding instanceof QueueBinding) {