You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/31 09:06:18 UTC

git commit: updated refs/heads/4.3-forward to a4f2f0b

Updated Branches:
  refs/heads/4.3-forward ba5b302ae -> a4f2f0b39


findbugs get from map with proper key-type

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4f2f0b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4f2f0b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4f2f0b3

Branch: refs/heads/4.3-forward
Commit: a4f2f0b39fadf3510e15c8955a50a3a4a5d7c694
Parents: ba5b302
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 31 09:06:11 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 09:06:11 2014 +0100

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkModelImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4f2f0b3/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 27b2006..f64c68a 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1024,14 +1024,14 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
         List<NetworkOfferingServiceMapVO> map = _ntwkOfferingSrvcDao.listByNetworkOfferingId(networkOfferingId);
     
         for (NetworkOfferingServiceMapVO instance : map) {
-            String service = instance.getService();
+            Service service = Network.Service.getService(instance.getService());
             Set<Provider> providers;
             providers = serviceProviderMap.get(service);
             if (providers == null) {
                 providers = new HashSet<Provider>();
             }
             providers.add(Provider.getProvider(instance.getProvider()));
-            serviceProviderMap.put(Service.getService(service), providers);
+            serviceProviderMap.put(service, providers);
         }
     
         return serviceProviderMap;