Return-Path: 
 <cloudstack-commits-return-13974-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1023BE314
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Mon, 18 Mar 2013 12:27:15 +0000 (UTC)
Received: (qmail 36479 invoked by uid 500); 18 Mar 2013 12:27:13 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 35990 invoked by uid 500); 18 Mar 2013 12:27:12 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 35832 invoked by uid 99); 18 Mar 2013 12:27:11 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 12:27:11 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id BE41C35D47; Mon, 18 Mar 2013 12:27:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tsp@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [40/50] [abbrv] git commit: refs/heads/marvin-refactor -
 CLOUDSTACK-1702: Changed getId to getUuid in an exception message string.
Message-Id: <20130318122710.BE41C35D47@tyr.zones.apache.org>
Date: Mon, 18 Mar 2013 12:27:10 +0000 (UTC)

CLOUDSTACK-1702: Changed getId to getUuid in an exception message
string.

This doesn't resolve the bug in question, but does fix the specific
message that was reported as the origin of the bug.

Signed-off-by: Chip Childers <chip.childers@gmail.com>


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

Branch: refs/heads/marvin-refactor
Commit: eee720ceaa5339186bc7492f01c45a40aade3e75
Parents: f0a77d6
Author: Chip Childers <chip.childers@gmail.com>
Authored: Sat Mar 16 15:04:19 2013 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Sat Mar 16 15:22:51 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/eee720ce/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 52089df..779b9f2 100644
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1457,11 +1457,11 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
         if (network.getGuestType() != Network.GuestType.Shared) {
             List<NetworkVO> networkMap = _networksDao.listBy(owner.getId(), network.getId());
             if (networkMap == null || networkMap.isEmpty()) {
-                throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied");
+                throw new PermissionDeniedException("Unable to use network with id= " + network.getUuid() + ", permission denied");
             }
         } else {
             if (!isNetworkAvailableInDomain(network.getId(), owner.getDomainId())) {
-                throw new PermissionDeniedException("Shared network id=" + network.getId() + " is not available in domain id=" + owner.getDomainId());
+                throw new PermissionDeniedException("Shared network id=" + network.getUuid() + " is not available in domain id=" + owner.getDomainId());
             }
         }
     }