bug CS-14785: String equality should be through equals function....what was i thinking !!!.

nitinmeh · nitinmeh · commit 189ac88a11df · 2012-05-08T16:07:52.000+05:30
diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java
@@ -214,7 +214,11 @@ public void setDisconnected() {
 	}
 
 	public void logDisconnect() {
-		s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName());
+		if (template != null){
+			s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName());
+		}else {
+			s_logger.warn("Unable to monitor download progress of " + volume.getName() + " at host " + sserver.getName());
+		}
 	}
 
 	public synchronized void updateDatabase(Status state, String errorString) {
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -591,7 +591,7 @@ public Volume attachVolumeToVM(AttachVolumeCmd command) {
             }else {
             	try {
                 	// Format of data disk should be the same as root disk
-                	if(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId()) != volHostVO.getFormat().getFileExtension()){
+                	if( ! volHostVO.getFormat().getFileExtension().equals(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId())) ){
                 		throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " +volHostVO.getFormat().getFileExtension()+
                 				" is not compatible with the vm hypervisor type" );
                 	}

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,11 @@ public void setDisconnected() {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`public void logDisconnect() {`
`217`		`- s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName());`
	`217`	`+ if (template != null){`
	`218`	`+ s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName());`
	`219`	`+ }else {`
	`220`	`+ s_logger.warn("Unable to monitor download progress of " + volume.getName() + " at host " + sserver.getName());`
	`221`	`+ }`
`218`	`222`	`}`
`219`	`223`
`220`	`224`	`public synchronized void updateDatabase(Status state, String errorString) {`
Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ public Volume attachVolumeToVM(AttachVolumeCmd command) {`
`591`	`591`	`}else {`
`592`	`592`	`try {`
`593`	`593`	`// Format of data disk should be the same as root disk`
`594`		`- if(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId()) != volHostVO.getFormat().getFileExtension()){`
	`594`	`+ if( ! volHostVO.getFormat().getFileExtension().equals(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId())) ){`
`595`	`595`	`throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " +volHostVO.getFormat().getFileExtension()+`
`596`	`596`	`" is not compatible with the vm hypervisor type" );`
`597`	`597`	`}`