Repository: cloudstack Updated Branches: refs/heads/4.5 fd459b89f -> 8dc8e9b8f
CLOUDSTACK-8649: Fixed unnecessary double url decoding in registerSSHKeyPair. Signed-off-by: wilderrodrigues <[email protected]> This closes #615 (cherry picked from commit 2e79c628e052ebdaf782458cfe4c4ef6e95545c6) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: server/src/com/cloud/server/ManagementServerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8dc8e9b8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8dc8e9b8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8dc8e9b8 Branch: refs/heads/4.5 Commit: 8dc8e9b8f31ef249a553cb20fb5be617a74cfbba Parents: fd459b8 Author: Boris Schrijver <[email protected]> Authored: Wed Jul 22 12:50:54 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Fri Jul 24 14:59:30 2015 +0530 ---------------------------------------------------------------------- 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/8dc8e9b8/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 5946b29..be61b22 100755 --- 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; @@ -3617,11 +3615,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe String name = cmd.getName(); String key = cmd.getPublicKey(); - try { - key = URLDecoder.decode(key, "UTF-8"); - } catch (UnsupportedEncodingException e) { - s_logger.warn("key decoding tried invain: " + e.getLocalizedMessage()); - } + String publicKey = getPublicKeyFromKeyKeyMaterial(key); String fingerprint = getFingerprint(publicKey);
