cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/master to 990da08
Date Mon, 10 Nov 2014 10:15:25 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 781648fb1 -> 990da0845


Add check to ensure VR template version matches digit.digit.digit format. Returns version
as 0 otherwise


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

Branch: refs/heads/master
Commit: 990da0845170d1ca6af9c26de94195417d1fbd19
Parents: 781648f
Author: Kishan Kavala <kishan@apache.org>
Authored: Mon Oct 20 22:15:17 2014 +0530
Committer: Kishan Kavala <kishan@apache.org>
Committed: Mon Nov 10 15:33:50 2014 +0530

----------------------------------------------------------------------
 utils/src/com/cloud/maint/Version.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/990da084/utils/src/com/cloud/maint/Version.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/maint/Version.java b/utils/src/com/cloud/maint/Version.java
index 22b2f33..925806e 100644
--- a/utils/src/com/cloud/maint/Version.java
+++ b/utils/src/com/cloud/maint/Version.java
@@ -64,7 +64,7 @@ public class Version {
 
     public static String trimRouterVersion(String version) {
         String[] tokens = version.split(" ");
-        if (tokens.length >= 3) {
+        if (tokens.length >= 3 && tokens[2].matches("[0-9]+(\\.[0-9]+)*")) {
             return tokens[2];
         }
         return "0";


Mime
View raw message