CLOUDSTACK-8649: Fixed unnecessary double url decoding in registerSSHKeyPair.
Signed-off-by: wilderrodrigues <wrodrig...@schubergphilis.com> This closes #615 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e79c628 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e79c628 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e79c628 Branch: refs/heads/reporter Commit: 2e79c628e052ebdaf782458cfe4c4ef6e95545c6 Parents: d632d63 Author: Boris Schrijver <bo...@pcextreme.nl> Authored: Wed Jul 22 12:50:54 2015 +0200 Committer: wilderrodrigues <wrodrig...@schubergphilis.com> Committed: Thu Jul 23 08:18:15 2015 +0200 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e79c628/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 781c915..bd2afa3 100644 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -16,9 +16,7 @@ // under the License. package com.cloud.server; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; -import java.net.URLDecoder; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -3625,11 +3623,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe final String name = cmd.getName(); String key = cmd.getPublicKey(); - try { - key = URLDecoder.decode(key, "UTF-8"); - } catch (final UnsupportedEncodingException e) { - s_logger.warn("key decoding tried invain: " + e.getLocalizedMessage()); - } + final String publicKey = getPublicKeyFromKeyKeyMaterial(key); final String fingerprint = getFingerprint(publicKey);
