cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to 0c6e8ba
Date Mon, 23 Dec 2013 11:58:25 GMT
CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check
when comparing min version


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

Branch: refs/heads/4.3
Commit: 9471797590590313db23e2657d9124e053e681fa
Parents: 5b58128
Author: Kishan Kavala <kishan@cloud.com>
Authored: Mon Dec 23 16:38:56 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Mon Dec 23 17:28:07 2013 +0530

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java  | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94717975/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 6c6481d..a970af6 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4074,6 +4074,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
     //Checks if the router is at the required version
     // Compares MS version and router version
     private boolean checkRouterVersion(VirtualRouter router){
+        if(router.getTemplateVersion() == null){
+            return false;
+        }
         String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion());
         return (Version.compare(trimmedVersion, _minVRVersion) >= 0);
     }


Mime
View raw message