From 55d84bdd5fd7f1452480bb1fd876ebfda8ce0cd9 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Mon, 23 Dec 2013 16:38:56 +0530
Subject: [PATCH] CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x
 routers is null. Added null check when comparing min version

---
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index d3c3312f53a..3f3e9bd0974 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4138,7 +4138,10 @@ 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) {
+    private boolean checkRouterVersion(VirtualRouter router){
+        if(router.getTemplateVersion() == null){
+            return false;
+        }
         String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion());
         return (Version.compare(trimmedVersion, MinVRVersion) >= 0);
     }