cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [2/3] git commit: updated refs/heads/master-6-17-stable to 12e984f
Date Tue, 02 Jul 2013 17:18:55 GMT
CLOUDSTACK-236: log uuid instead of actual db id, in the updateNetworkOffering method


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

Branch: refs/heads/master-6-17-stable
Commit: d001e43fb4a5578e17e411d96764d7b3a8c3bf90
Parents: 05aba49
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Mon Jul 1 15:09:06 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Jul 2 10:06:34 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d001e43f/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index f88f600..8cdcfde 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2025,7 +2025,8 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
                 }
                 // check if the network is upgradable
                 if (!canUpgrade(network, oldNetworkOfferingId, networkOfferingId)) {
-                    throw new InvalidParameterValueException("Can't upgrade from network
offering " + oldNetworkOfferingId + " to " + networkOfferingId + "; check logs for more information");
+                    throw new InvalidParameterValueException("Can't upgrade from network
offering " + oldNtwkOff.getUuid() +
+                            " to " + networkOffering.getUuid() + "; check logs for more information");
                 }
                 restartNetwork = true;
                 networkOfferingChanged = true;
@@ -2333,7 +2334,7 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
                 return false;
             }
             if (!oldNetworkOffering.getTags().equalsIgnoreCase(newNetworkOffering.getTags()))
{
-                s_logger.debug("Network offerings " + newNetworkOfferingId + " and " + oldNetworkOfferingId
+ " have different tags, can't upgrade");
+                s_logger.debug("Network offerings " + newNetworkOffering.getUuid() + " and
" + oldNetworkOffering.getUuid() + " have different tags, can't upgrade");
                 return false;
             }
         }


Mime
View raw message