cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/master to a22abeb
Date Tue, 12 Aug 2014 22:27:10 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cf8a00cbf -> a22abeb0e


CLOUDSTACK-7328:[Automation] Register ISO failing with invalid iso
format error.


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

Branch: refs/heads/master
Commit: a22abeb0e7c8090f018b65e8a0594db589a13cd2
Parents: cf8a00c
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Aug 12 14:53:16 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Aug 12 15:26:50 2014 -0700

----------------------------------------------------------------------
 utils/src/com/cloud/utils/UriUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a22abeb0/utils/src/com/cloud/utils/UriUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/UriUtils.java b/utils/src/com/cloud/utils/UriUtils.java
index 0657c74..9f6f037 100644
--- a/utils/src/com/cloud/utils/UriUtils.java
+++ b/utils/src/com/cloud/utils/UriUtils.java
@@ -337,7 +337,8 @@ public class UriUtils {
                         && !uripath.toLowerCase().endsWith("vmdk.bz2")
                         && !uripath.toLowerCase().endsWith("vmdk.gz")))
                 || (format.equalsIgnoreCase("iso")
-                && (!uripath.toLowerCase().endsWith("iso.zip")
+                && (!uripath.toLowerCase().endsWith("iso")
+                        && !uripath.toLowerCase().endsWith("iso.zip")
                         && !uripath.toLowerCase().endsWith("iso.bz2")
                         && !uripath.toLowerCase().endsWith("iso.gz")))) {
             throw new IllegalArgumentException("Please specify a valid URL. URL:" + uripath
+ " is an invalid for the format " + format.toLowerCase());


Mime
View raw message