You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/07/02 00:13:52 UTC
git commit: updated refs/heads/master to 37f12a3
Updated Branches:
refs/heads/master 41a8cc7c6 -> 37f12a31a
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/37f12a31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37f12a31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37f12a31
Branch: refs/heads/master
Commit: 37f12a31a353855d5e7bde2b4abca3d17b6a463e
Parents: 41a8cc7
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 1 15:09:06 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jul 1 15:13:19 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/37f12a31/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 5e900bb..8346871 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;
}
}