Return-Path: 
 <commits-return-37605-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9A35E10DC2
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 31 Jan 2014 08:06:22 +0000 (UTC)
Received: (qmail 80757 invoked by uid 500); 31 Jan 2014 08:06:22 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 80573 invoked by uid 500); 31 Jan 2014 08:06:20 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 80547 invoked by uid 99); 31 Jan 2014 08:06:19 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 08:06:19 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id D95BC917649; Fri, 31 Jan 2014 08:06:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dahn@apache.org
To: commits@cloudstack.apache.org
Message-Id: <27e714dbc0ad44a99c6bb0137d941ba6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.3-forward to a4f2f0b
Date: Fri, 31 Jan 2014 08:06:18 +0000 (UTC)

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 <daan@onecht.net>
Authored: Fri Jan 31 09:06:11 2014 +0100
Committer: Daan Hoogland <daan@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;