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

bug 12695: fixed verifyNetwork capabilities 

status 12695: resolved fixed

reviewed-by: Sheng Yang
This commit is contained in:
Alena Prokharchyk 2011-12-20 19:10:41 -08:00
parent a72216464b
commit 4c9a9e8386
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2956,7 +2956,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if(element != null){
Map<Service, Map<Capability, String>> elementCapabilities = element.getCapabilities();;
if (elementCapabilities == null || elementCapabilities.get(service) == null) {
if (elementCapabilities == null || !elementCapabilities.containsKey(service)) {
throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + provider);
}
serviceCapabilities = elementCapabilities.get(service);
@ -2988,7 +2988,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if(element != null){
Map<Service, Map<Capability, String>> elementCapabilities = element.getCapabilities();;
if (elementCapabilities == null || elementCapabilities.get(service) == null) {
if (elementCapabilities == null || !elementCapabilities.containsKey(service)) {
throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + provider);
}
serviceCapabilities = elementCapabilities.get(service);