CLOUDSTACK-3184: updateVirtualMachine api gives java NPE.

sanjaytripathi · Prasanna Santhanam · commit 31df729008c7 · 2013-07-03T19:39:02.000+05:30
Signed-off-by: Prasanna Santhanam &lt;tsp@apache.org&gt;
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1782,7 +1782,7 @@ public UserVm updateVirtualMachine(UpdateVMCmd cmd)
 
         String description = "";
 
-        if (!displayName.equals(vmInstance.getDisplayName())) {
+        if (displayName != null && !displayName.equals(vmInstance.getDisplayName())) {
             description += "New display name: " + displayName + ". ";
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1782,7 +1782,7 @@ public UserVm updateVirtualMachine(UpdateVMCmd cmd)`
`1782`	`1782`
`1783`	`1783`	`String description = "";`
`1784`	`1784`
`1785`		`- if (!displayName.equals(vmInstance.getDisplayName())) {`
	`1785`	`+ if (displayName != null && !displayName.equals(vmInstance.getDisplayName())) {`
`1786`	`1786`	`description += "New display name: " + displayName + ". ";`
`1787`	`1787`	`}`
`1788`	`1788`