From 81bb2a43d1bf5dbcba0f4b3e01c7ae560e088744 Mon Sep 17 00:00:00 2001 From: "Ragnar B. Johannsson" Date: Thu, 13 Jan 2011 00:48:48 +0000 Subject: [PATCH] Do not save an SSH public key unless one is provided. --- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 8d3035a9e8f..064b36c3dee 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2316,7 +2316,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager UserVmVO vm = new UserVmVO(id, instanceName, cmd.getDisplayName(), template.getId(), hypervisorType, template.getGuestOSId(), offering.getOfferHA(), domainId, owner.getId(), offering.getId(), userData, hostName); - vm.setDetail("SSH.PublicKey", sshPublicKey); + if (sshPublicKey != null) + vm.setDetail("SSH.PublicKey", sshPublicKey); if (_itMgr.allocate(vm, template, offering, rootDiskOffering, dataDiskOfferings, networks, null, plan, cmd.getHypervisor(), owner) == null) { return null;