etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8649: Fixed unnecessary double url decoding in registerSSHKeyPair. 

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>

This closes #615

(cherry picked from commit 2e79c628e0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
This commit is contained in:
Boris Schrijver 2015-07-22 12:50:54 +02:00 committed by Rohit Yadav
parent fd459b89ff
commit 8dc8e9b8f3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -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);