Revision f3633a16 src/com/rackspace/cloud/loadbalancer/api/client/LoadBalancerManager.java
b/src/com/rackspace/cloud/loadbalancer/api/client/LoadBalancerManager.java | ||
---|---|---|
143 | 143 |
public ArrayList<LoadBalancer> createList() throws LoadBalancersException { |
144 | 144 |
|
145 | 145 |
ArrayList<LoadBalancer> loadBalancers = new ArrayList<LoadBalancer>(); |
146 |
|
|
146 |
String authServer = Account.getAccount().getAuthServer(); |
|
147 |
if(authServer == null){ |
|
148 |
authServer = Account.getAccount().getAuthServerV2(); |
|
149 |
} |
|
150 |
|
|
147 | 151 |
// if US account |
148 |
if (Account.getAccount().getAuthServer() |
|
149 |
.equals(Preferences.COUNTRY_US_AUTH_SERVER)) { |
|
152 |
if (authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER) || authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER_V2)) { |
|
150 | 153 |
loadBalancers |
151 | 154 |
.addAll(createSublist(Account.getLoadBalancerORDUrl())); |
152 | 155 |
for (LoadBalancer loadBalancer : loadBalancers) { |
... | ... | |
160 | 163 |
loadBalancers.addAll(DFWloadBalancers); |
161 | 164 |
} |
162 | 165 |
// if UK account |
163 |
else if (Account.getAccount().getAuthServer() |
|
164 |
.equals(Preferences.COUNTRY_UK_AUTH_SERVER)) { |
|
166 |
else if (authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER) || authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER_V2)) { |
|
165 | 167 |
loadBalancers |
166 | 168 |
.addAll(createSublist(Account.getLoadBalancerLONUrl())); |
167 | 169 |
for (LoadBalancer loadBalancer : loadBalancers) { |
Also available in: Unified diff