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

fixed build failure

This commit is contained in:
kishan 2012-07-30 13:55:12 +05:30
parent dd50bdf38e
commit e87147de2e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
View File

@ -50,6 +50,7 @@ import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.UserContext;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.IdentityProxy;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
@ -207,9 +208,9 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
}
if (_vpnConnectionDao.findByCustomerGatewayId(customerGatewayId) != null) {
List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
idList.add(new IdentityProxy(customerGateway, customerGatewayId, "customerGatewayId"));
throw new InvalidParameterValueException("The vpn connection with specified customer gateway id " +
" already exists!", idList);
// idList.add(new IdentityProxy(customerGateway, customerGatewayId, "customerGatewayId"));
// throw new InvalidParameterValueException("The vpn connection with specified customer gateway id " +
// " already exists!", idList);
}
Site2SiteVpnConnectionVO conn = new Site2SiteVpnConnectionVO(owner.getAccountId(), owner.getDomainId(), vpnGatewayId, customerGatewayId);
conn.setState(State.Pending);