From a22abeb0e7c8090f018b65e8a0594db589a13cd2 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Tue, 12 Aug 2014 14:53:16 -0700
Subject: [PATCH] CLOUDSTACK-7328:[Automation] Register ISO failing with
 invalid iso format error.

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

diff --git a/utils/src/com/cloud/utils/UriUtils.java b/utils/src/com/cloud/utils/UriUtils.java
index 0657c7467b8..9f6f0377688 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());