From 1ac24cf4c86a1654d559d10ecc3cb67704b8fe20 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 13 Jun 2011 19:32:02 -0700 Subject: [PATCH] fixed uri.scheme null bug --- .../com/cloud/agent/manager/AgentManagerImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index cca82bdfdb9..e40e2d68ffb 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -865,12 +865,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS password = clusterDetails.get("password"); assert(password != null); - try { - uri = new URI(UriUtils.encodeURIComponent(url)); + if(hypervisorType.equalsIgnoreCase(HypervisorType.VMware.toString())) { + try { + uri = new URI(UriUtils.encodeURIComponent(url)); - url = clusterDetails.get("url") + "/" + uri.getHost(); - } catch (URISyntaxException e) { - throw new InvalidParameterValueException(url + " is not a valid uri"); + url = clusterDetails.get("url") + "/" + uri.getHost(); + } catch (URISyntaxException e) { + throw new InvalidParameterValueException(url + " is not a valid uri"); + } } } else { if(hypervisorType.equalsIgnoreCase(HypervisorType.VMware.toString()))