etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

S2S VPN: Fix NPE when executes list command

This commit is contained in:
Sheng Yang 2012-07-18 15:53:15 -07:00
parent f778f0f174
commit 78391cef8a
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
View File

@ -73,6 +73,9 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
List<Site2SiteVpnConnectionResponse> connResponses = new ArrayList<Site2SiteVpnConnectionResponse>();
if (conns != null && !conns.isEmpty()) {
for (Site2SiteVpnConnection conn : conns) {
if (conn == null) {
continue;
}
Site2SiteVpnConnectionResponse site2SiteVpnConnectonRes = _responseGenerator.createSite2SiteVpnConnectionResponse(conn);
site2SiteVpnConnectonRes.setObjectName("vpnconnection");
connResponses.add(site2SiteVpnConnectonRes);

3
api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
View File

@ -65,6 +65,9 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc
List<Site2SiteCustomerGatewayResponse> gwResponses = new ArrayList<Site2SiteCustomerGatewayResponse>();
if (gws != null && !gws.isEmpty()) {
for (Site2SiteCustomerGateway gw : gws) {
if (gw == null) {
continue;
}
Site2SiteCustomerGatewayResponse site2SiteCustomerGatewayRes = _responseGenerator.createSite2SiteCustomerGatewayResponse(gw);
site2SiteCustomerGatewayRes.setObjectName("vpncustomergateway");
gwResponses.add(site2SiteCustomerGatewayRes);

3
api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
View File

@ -72,6 +72,9 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
List<Site2SiteVpnGatewayResponse> gwResponses = new ArrayList<Site2SiteVpnGatewayResponse>();
if (gws != null && !gws.isEmpty()) {
for (Site2SiteVpnGateway gw : gws) {
if (gw == null) {
continue;
}
Site2SiteVpnGatewayResponse site2SiteVpnGatewayRes = _responseGenerator.createSite2SiteVpnGatewayResponse(gw);
site2SiteVpnGatewayRes.setObjectName("vpngateway");
gwResponses.add(site2SiteVpnGatewayRes);