CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version

Kishan Kavala · Kishan Kavala · commit 55d84bdd5fd7 · 2013-12-23T17:15:03.000+05:30
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4138,7 +4138,10 @@ public List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd) {
 
     //Checks if the router is at the required version
     // Compares MS version and router version
-    private boolean checkRouterVersion(VirtualRouter router) {
+    private boolean checkRouterVersion(VirtualRouter router){
+        if(router.getTemplateVersion() == null){
+            return false;
+        }
         String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion());
         return (Version.compare(trimmedVersion, MinVRVersion) >= 0);
     }
