Updated Branches: refs/heads/master 6d200c502 -> 3e8655b58
CLOUDSTACK-424: Fix NPE while updating user data Replace newlines in userdata only when it's not null. Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/55447c25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/55447c25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/55447c25 Branch: refs/heads/master Commit: 55447c25720b929c4544789542e0c87e88430d23 Parents: 6d200c5 Author: Rohit Yadav <[email protected]> Authored: Wed Nov 21 18:24:05 2012 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Nov 21 18:27:11 2012 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/55447c25/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 1533416..687f521 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1763,7 +1763,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager Boolean ha = cmd.getHaEnable(); Long id = cmd.getId(); Long osTypeId = cmd.getOsTypeId(); - String userData = cmd.getUserData().replace("\\n", ""); + String userData = cmd.getUserData(); // Input validation UserVmVO vmInstance = null; @@ -1802,6 +1802,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager boolean updateUserdata = false; if (userData != null) { + // check and replace newlines + userData = userData.replace("\\n", ""); validateUserData(userData); // update userData on domain router. updateUserdata = true;
