From 747ab40f4822af4c2747d32577be609d93680d7d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 2 May 2011 16:54:30 -0700
Subject: [PATCH] fix a bug - adding a cluster of type XenServer returned an
 error.

---
 server/src/com/cloud/agent/manager/AgentManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 63c51cdc8a0..01220d375ca 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -567,7 +567,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
         String username = cmd.getUsername();
         String password = cmd.getPassword();
 
-        url = URLDecoder.decode(url);
+        if(url != null)
+        	url = URLDecoder.decode(url);
 
         URI uri = null;